From cecfb356554f4adffea62e5eab9c5ca5b7d5f234 Mon Sep 17 00:00:00 2001 From: Liam Hongman Cho Date: Fri, 29 Mar 2024 13:44:30 +0900 Subject: [PATCH 1/3] Added error catch logic in message template payload handling --- src/ui/TemplateMessageItemBody/index.tsx | 26 +++++++++++++++--------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/ui/TemplateMessageItemBody/index.tsx b/src/ui/TemplateMessageItemBody/index.tsx index a242c1373..6d436f1a3 100644 --- a/src/ui/TemplateMessageItemBody/index.tsx +++ b/src/ui/TemplateMessageItemBody/index.tsx @@ -138,19 +138,25 @@ export function TemplateMessageItemBody({ nonCachedTemplateKeys.push(templateKey); } if (templateData.view_variables) { - // eslint-disable-next-line @typescript-eslint/no-unused-vars - Object.entries(templateData.view_variables).forEach(([_, simpleTemplateDataList]) => { - simpleTemplateDataList.forEach((simpleTemplateData: SimpleTemplateData) => { - const simpleTemplateKey = simpleTemplateData?.key; - if (simpleTemplateKey) { - if (!getCachedTemplate(simpleTemplateKey)) { - if (simpleTemplateKey && nonCachedTemplateKeys.indexOf(simpleTemplateKey) === -1) { - nonCachedTemplateKeys.push(simpleTemplateKey); + try { + // eslint-disable-next-line @typescript-eslint/no-unused-vars + Object.entries(templateData.view_variables).forEach(([_, simpleTemplateDataList]) => { + simpleTemplateDataList.forEach((simpleTemplateData: SimpleTemplateData) => { + const simpleTemplateKey = simpleTemplateData?.key; + if (simpleTemplateKey) { + if (!getCachedTemplate(simpleTemplateKey)) { + if (simpleTemplateKey && nonCachedTemplateKeys.indexOf(simpleTemplateKey) === -1) { + nonCachedTemplateKeys.push(simpleTemplateKey); + } } } - } + }); }); - }); + } catch (e) { + logger.error('TemplateMessageItemBody | received view_variables is malformed: ', templateData); + result.isErrored = true; + return result; + } } try { if (nonCachedTemplateKeys.length > 0) { From 9a262222b5f328bd3d6b5c11360acdeed16c534b Mon Sep 17 00:00:00 2001 From: Liam Hongman Cho Date: Fri, 29 Mar 2024 15:28:23 +0900 Subject: [PATCH 2/3] Update src/ui/TemplateMessageItemBody/index.tsx Co-authored-by: Ahyoung Ryu --- src/ui/TemplateMessageItemBody/index.tsx | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/ui/TemplateMessageItemBody/index.tsx b/src/ui/TemplateMessageItemBody/index.tsx index 6d436f1a3..392be09e5 100644 --- a/src/ui/TemplateMessageItemBody/index.tsx +++ b/src/ui/TemplateMessageItemBody/index.tsx @@ -143,11 +143,12 @@ export function TemplateMessageItemBody({ Object.entries(templateData.view_variables).forEach(([_, simpleTemplateDataList]) => { simpleTemplateDataList.forEach((simpleTemplateData: SimpleTemplateData) => { const simpleTemplateKey = simpleTemplateData?.key; - if (simpleTemplateKey) { - if (!getCachedTemplate(simpleTemplateKey)) { - if (simpleTemplateKey && nonCachedTemplateKeys.indexOf(simpleTemplateKey) === -1) { - nonCachedTemplateKeys.push(simpleTemplateKey); - } + +if (simpleTemplateKey && + !getCachedTemplate(simpleTemplateKey) && + !nonCachedTemplateKeys.includes(simpleTemplateKey)) { + nonCachedTemplateKeys.push(simpleTemplateKey); +} } } }); From 1ee101b0a4b9d4c4ce6ae362fbf90c3e5602c9c6 Mon Sep 17 00:00:00 2001 From: Liam Hongman Cho Date: Fri, 29 Mar 2024 15:29:37 +0900 Subject: [PATCH 3/3] apply feeds --- src/ui/TemplateMessageItemBody/index.tsx | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/ui/TemplateMessageItemBody/index.tsx b/src/ui/TemplateMessageItemBody/index.tsx index 392be09e5..f5adc9852 100644 --- a/src/ui/TemplateMessageItemBody/index.tsx +++ b/src/ui/TemplateMessageItemBody/index.tsx @@ -143,13 +143,12 @@ export function TemplateMessageItemBody({ Object.entries(templateData.view_variables).forEach(([_, simpleTemplateDataList]) => { simpleTemplateDataList.forEach((simpleTemplateData: SimpleTemplateData) => { const simpleTemplateKey = simpleTemplateData?.key; - -if (simpleTemplateKey && - !getCachedTemplate(simpleTemplateKey) && - !nonCachedTemplateKeys.includes(simpleTemplateKey)) { - nonCachedTemplateKeys.push(simpleTemplateKey); -} - } + if ( + simpleTemplateKey + && !getCachedTemplate(simpleTemplateKey) + && !nonCachedTemplateKeys.includes(simpleTemplateKey) + ) { + nonCachedTemplateKeys.push(simpleTemplateKey); } }); });