Skip to content

Commit 521e501

Browse files
committed
MC-5691: Implement better developer error reporting
- Allow errors within stage-builder to bubble up to main catch - Add additional step to test to increase stability
1 parent becc9c4 commit 521e501

File tree

6 files changed

+10
-25
lines changed

6 files changed

+10
-25
lines changed

app/code/Magento/PageBuilder/Test/Mftf/Test/AdminPageBuilderReadNonMasterFormatTest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,7 @@
121121
</actionGroup>
122122
<waitForElementVisible selector="{{CmsNewPagePageActionsSection.pageTitle}}" stepKey="waitForPageBuilderDisplay" />
123123
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="waitForShowHideEditor" />
124+
<waitForElementVisible selector="{{TinyMCESection.TinyMCE4}}" stepKey="waitForTinyMCE4" />
124125
<click selector="{{CmsNewPagePageActionsSection.showHideEditor}}" stepKey="clickShowHideEditor"/>
125126
<waitForElementVisible time="1" selector="{{CmsNewPagePageActionsSection.content}}" stepKey="waitForContentField" />
126127
<fillField selector="{{CmsNewPagePageActionsSection.content}}" userInput="{{cmsPageNonexistentDataRole.content}}" stepKey="enterContent"/>

app/code/Magento/PageBuilder/view/adminhtml/web/js/master-format/read/configurable.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/js/stage-builder.js

Lines changed: 3 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/preview.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,7 @@ export default class Preview {
586586

587587
return appearanceConfig(
588588
this.config.name,
589-
appearance
589+
appearance,
590590
).preview_template;
591591
}
592592

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/master-format/read/configurable.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import $ from "jquery";
77
import mageUtils from "mageUtils";
88
import _ from "underscore";
9+
import Config from "../../config";
910
import appearanceConfig from "../../content-type/appearance-config";
1011
import PropertyReaderPool from "../../converter/converter-pool";
1112
import ConverterPool from "../../converter/converter-pool";
@@ -14,7 +15,6 @@ import MassConverterPool from "../../mass-converter/converter-pool";
1415
import massConverterPoolFactory from "../../mass-converter/converter-pool-factory";
1516
import propertyReaderPoolFactory from "../../property/property-reader-pool-factory";
1617
import {ReadInterface} from "../read-interface";
17-
import Config from "../../config";
1818

1919
/**
2020
* @api

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/stage-builder.ts

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,7 @@ function buildElementIntoStage(element: Element, parent: ContentTypeCollectionIn
6060
return Promise.all(childrenPromises.map((child, index) => {
6161
parent.addChild(child);
6262
return buildElementIntoStage(childElements[index], child, stage);
63-
})).catch((error) => {
64-
console.error(error);
65-
return null;
66-
});
67-
}).catch((error) => {
68-
console.error(error);
69-
return null;
63+
}));
7064
});
7165
}
7266
}
@@ -135,9 +129,6 @@ function getElementData(element: HTMLElement, config: ContentTypeConfigInterface
135129
});
136130
});
137131
}
138-
}).catch((error) => {
139-
console.error(error);
140-
return null;
141132
});
142133
}
143134

@@ -223,7 +214,8 @@ export default function build(
223214
// Determine if we're building from existing page builder content
224215
if (validateFormat(content)) {
225216
currentBuild = buildFromContent(stage, content)
226-
.catch(() => {
217+
.catch((error: Error) => {
218+
console.error(error);
227219
stage.children([]);
228220
currentBuild = buildEmpty(stage, content);
229221
});

0 commit comments

Comments
 (0)