Skip to content

Commit dbe5453

Browse files
committed
PB-301: Products lose their conditions after upgrade
1 parent 42cecc4 commit dbe5453

File tree

4 files changed

+23
-14
lines changed

4 files changed

+23
-14
lines changed

app/code/Magento/PageBuilder/view/adminhtml/web/js/content-type/products/mass-converter/carousel-widget-directive.js

Lines changed: 5 additions & 2 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/js/content-type/products/mass-converter/widget-directive.js

Lines changed: 6 additions & 6 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/products/mass-converter/carousel-widget-directive.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ export default class WidgetDirective extends BaseWidgetDirective {
2929

3030
data.carousel_products_count = attributes.products_count;
3131
data.sort_order = attributes.sort_order;
32-
data.condition_option = attributes.condition_option;
32+
data.condition_option = attributes.condition_option || "condition";
3333
data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
3434
data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
3535
data[data.condition_option + "_source"] = data.conditions_encoded;
@@ -51,12 +51,15 @@ export default class WidgetDirective extends BaseWidgetDirective {
5151
id_path: "",
5252
show_pager: 0,
5353
products_count: data.carousel_products_count,
54-
sort_order: data.sort_order,
5554
condition_option: data.condition_option,
5655
condition_option_value: "",
5756
type_name: "Catalog Products Carousel",
5857
conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
59-
};
58+
} as { [key: string]: any; };
59+
60+
if (data.sort_order) {
61+
attributes.sort_order = data.sort_order
62+
}
6063

6164
if (typeof data[data.condition_option] === "string") {
6265
attributes.condition_option_value = this.encodeWysiwygCharacters(data[data.condition_option]);

app/code/Magento/PageBuilder/view/adminhtml/web/ts/js/content-type/products/mass-converter/widget-directive.ts

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,12 @@ export default class WidgetDirective extends BaseWidgetDirective {
5454
condition_option: data.condition_option,
5555
condition_option_value: "",
5656
type_name: "Catalog Products List",
57-
conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
58-
...data.sort_order && { sort_order: data.sort_order}
59-
};
57+
conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || "")
58+
} as { [key: string]: any; };
59+
60+
if (data.sort_order) {
61+
attributes.sort_order = data.sort_order
62+
}
6063

6164
if (typeof data[data.condition_option] === "string") {
6265
attributes.condition_option_value = this.encodeWysiwygCharacters(data[data.condition_option]);

0 commit comments

Comments
 (0)