From b8ab5562597900ade9b136898789431145351436 Mon Sep 17 00:00:00 2001 From: Sophie O'Hagan Date: Wed, 8 Nov 2023 09:17:50 +0000 Subject: [PATCH 1/2] Updated multiinput submission for ukaddressfield --- .../engine/models/submission/WebhookModel.ts | 18 +++++++++++++++++- .../RepeatingSummaryPageController.ts | 1 + 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/runner/src/server/plugins/engine/models/submission/WebhookModel.ts b/runner/src/server/plugins/engine/models/submission/WebhookModel.ts index 2f642e138d..cefefe2cf4 100644 --- a/runner/src/server/plugins/engine/models/submission/WebhookModel.ts +++ b/runner/src/server/plugins/engine/models/submission/WebhookModel.ts @@ -2,6 +2,22 @@ import { DetailItem } from "../types"; import { format } from "date-fns"; import config from "server/config"; +function flattenMultiInput(rawValue) { + if (!rawValue) return rawValue; + rawValue.forEach((value) => { + Object.keys(value).map((key) => { + if (typeof value[key] == "object" && value[key] !== null) { + value[key] = Object.values(value[key]) + .filter((p) => { + return !!p; + }) + .join(", "); + } + }); + }); + return rawValue; +} + function answerFromDetailItem(item) { switch (item.dataType) { case "list": @@ -18,7 +34,7 @@ function answerFromDetailItem(item) { const [month, year] = Object.values(item.rawValue); return format(new Date(`${year}-${month}-1`), "yyyy-MM"); case "multiInput": - return item.rawValue; + return flattenMultiInput(item.rawValue); default: return item.value; } diff --git a/runner/src/server/plugins/engine/pageControllers/RepeatingSummaryPageController.ts b/runner/src/server/plugins/engine/pageControllers/RepeatingSummaryPageController.ts index bd6b858ed1..47bc19e4aa 100644 --- a/runner/src/server/plugins/engine/pageControllers/RepeatingSummaryPageController.ts +++ b/runner/src/server/plugins/engine/pageControllers/RepeatingSummaryPageController.ts @@ -196,6 +196,7 @@ export class RepeatingSummaryPageController extends PageController { } else if (componentType == "YesNoField") { return value ? "Yes" : "No"; } else if (componentType == "UkAddressField") { + if (typeof (value === "string")) return value; return value ? [ value.addressLine1, From d12fa26ef11827b26ee909903d5f06e774b8a7c7 Mon Sep 17 00:00:00 2001 From: FSD Github Actions Date: Wed, 8 Nov 2023 09:25:49 +0000 Subject: [PATCH 2/2] Update version to 0.1.188 --- version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version b/version index 4ba5298127..9542e8b3a1 100644 --- a/version +++ b/version @@ -1 +1 @@ -VERSION=0.1.187 +VERSION=0.1.188