Merge branch 'master' into EAR-2311-moving-page-repeating-section-int…

…o-list-collector-folder

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

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 };

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,
 };

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) =>
@@ -271,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);
 
@@ -297,7 +307,7 @@ const saveQuestionnaire = async (changedQuestionnaire) => {
 
     const baseDoc = db.collection("questionnaires").doc(id);
     await baseDoc.update({
-      ...justListFields(updatedQuestionnaire),
+      ...justListSaveFields(updatedQuestionnaire),
       updatedAt,
     });
 

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 questionnaire title",
+        ...questionnaire,
+      });
+      expect(createdAt === savedQuestionnaire.createdAt).toBeTruthy();
+    });
   });
 
   describe("Getting a list of questionnaires", () => {

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;