fix for placeholder ids (#151)

* fix for placeholder ids * fix snapshot
ONSdigital · Feb 10, 2023 · 4b3b914 · 4b3b914
1 parent eaf60ba
commit 4b3b914
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/src/eq_schema/block-types/listCollector/__snapshots__/index.test.js.snap b/src/eq_schema/block-types/listCollector/__snapshots__/index.test.js.snap
@@ -79,7 +79,7 @@ SummaryBlock {
   "item_title": Object {
     "placeholders": Array [
       Object {
-        "placeholder": "item-text-listcollector-1",
+        "placeholder": "listcollector_summary_placeholder",
         "transforms": Array [
           Object {
             "arguments": Object {
@@ -91,7 +91,7 @@ SummaryBlock {
         ],
       },
     ],
-    "text": "{item-text-listcollector-1}",
+    "text": "{listcollector_summary_placeholder}",
   },
   "title": "Summary",
 }

diff --git a/src/eq_schema/block-types/listCollector/summaryBlock.js b/src/eq_schema/block-types/listCollector/summaryBlock.js
@@ -7,10 +7,10 @@ class SummaryBlock {
     this.title = "Summary"
     const listAnswers = getList(ctx, page.listId).answers
     this.item_title = {
-      text: `{item-text-${page.id}}`,
+      text: `{listcollector_summary_placeholder}`,
       placeholders: [
         {
-          placeholder: `item-text-${page.id}`,
+          placeholder: `listcollector_summary_placeholder`,
           transforms: [
             {
               arguments: {

diff --git a/src/eq_schema/schema/Questionnaire/index.js b/src/eq_schema/schema/Questionnaire/index.js
@@ -1,6 +1,6 @@
 const { contentMap } = require("../../../constants/legalBases");
 
-const { buildContents } = require("../../../utils/builders");
+const { buildContents, formatListNames } = require("../../../utils/builders");
 
 const { validThemes, themeNames } = require("../../../constants/validThemes");
 
@@ -26,6 +26,7 @@ const getTheme = (previewTheme) => {
 
 class Questionnaire {
   constructor(questionnaireJson) {
+    formatListNames(questionnaireJson)
     const { surveyId } = questionnaireJson;
     const { formType, legalBasisCode } = getPreviewTheme(
       questionnaireJson.themeSettings

diff --git a/src/eq_schema/schema/Section/index.js b/src/eq_schema/schema/Section/index.js
@@ -40,10 +40,10 @@ class Section {
       };
 
       this.repeat.title = {
-        text: `{item-text-${section.id}}`,
+        text: `{repeat_title_placeholder}`,
         placeholders: [
           {
-            placeholder: `item-text-${section.id}`,
+            placeholder: `repeat_title_placeholder`,
             transforms: [
               {
                 arguments: {

diff --git a/src/utils/builders/index.js b/src/utils/builders/index.js
@@ -39,7 +39,18 @@ const buildIntroductionTitle = () => {
   };
 };
 
+const formatListNames = (questionnaire) => {
+  questionnaire.collectionLists.lists.forEach(
+    (list) => {
+      list.listName = list.listName.replace(/ /g,'_'); 
+      list.listName = list.listName.replace(/-/g,'_'); 
+      list.listName = list.listName.toLowerCase()
+    }
+  )
+}
+
 module.exports = {
   buildContents,
   buildIntroductionTitle,
+  formatListNames,
 };