From c8a2512665088d3f719f9b18059799d297ec8651 Mon Sep 17 00:00:00 2001 From: bhennes Date: Tue, 24 Jun 2025 10:33:46 +0200 Subject: [PATCH 1/2] #38565 We need to check that the value in the min-height converter is not undefined to avoid split to crash if the key does not exist. --- .../view/adminhtml/web/js/converter/style/min-height.js | 4 ++++ .../view/adminhtml/web/ts/js/converter/style/min-height.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/min-height.js b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/min-height.js index 54fc45259d4..d05ec962e99 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/min-height.js +++ b/app/code/Magento/PageBuilder/view/adminhtml/web/js/converter/style/min-height.js @@ -36,6 +36,10 @@ define(["Magento_PageBuilder/js/utils/object"], function (_object) { _proto.toDom = function toDom(name, data) { var value = (0, _object.get)(data, name); + // We need to check that value is not undefined at this point to avoid split to crash if the key does not exist + if (value === undefined) { + return ''; + } return value.split(/\+|\-|\*|\//).length > 1 ? "calc(" + (0, _object.get)(data, name) + ")" : value; }; diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts index 8e16bee6c6e..22c8185b2a0 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts +++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts @@ -30,6 +30,10 @@ export default class MinHeight implements ConverterInterface { */ public toDom(name: string, data: DataObject): string { const value = get(data, name); + // We need to check that value is not undefined at this point to avoid split to crash if the key does not exist + if (value === undefined) { + return ''; + } return value.split(/\+|\-|\*|\//).length > 1 ? `calc(${get(data, name)})` : value; } From c6f0c011d1ca3c1281e68dcf2fcf347c85960df4 Mon Sep 17 00:00:00 2001 From: bhennes Date: Mon, 14 Jul 2025 17:16:27 +0200 Subject: [PATCH 2/2] #38565 Correction based on automated test : replacing '' by "" is ts --- .../view/adminhtml/web/ts/js/converter/style/min-height.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts index 22c8185b2a0..3706d571ec4 100644 --- a/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts +++ b/app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/converter/style/min-height.ts @@ -32,7 +32,7 @@ export default class MinHeight implements ConverterInterface { const value = get(data, name); // We need to check that value is not undefined at this point to avoid split to crash if the key does not exist if (value === undefined) { - return ''; + return ""; } return value.split(/\+|\-|\*|\//).length > 1 ? `calc(${get(data, name)})` : value;