PB-301: Products lose their conditions after upgrade

Author: eug123

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

@@ -29,7 +29,7 @@ export default class WidgetDirective extends BaseWidgetDirective {
 
         data.products_count = attributes.products_count;
         data.sort_order = attributes.sort_order;
-        data.condition_option = attributes.condition_option;
+        data.condition_option = attributes.condition_option || "condition";
         data[data.condition_option] = this.decodeWysiwygCharacters(attributes.condition_option_value || "");
         data.conditions_encoded = this.decodeWysiwygCharacters(attributes.conditions_encoded || "");
         data[data.condition_option + "_source"] = data.conditions_encoded;
@@ -51,11 +51,11 @@ export default class WidgetDirective extends BaseWidgetDirective {
             id_path: "",
             show_pager: 0,
             products_count: data.products_count,
-            sort_order: data.sort_order,
             condition_option: data.condition_option,
             condition_option_value: "",
             type_name: "Catalog Products List",
             conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
+            ...data.sort_order && { sort_order: data.sort_order}
         };
 
         if (typeof data[data.condition_option] === "string") {

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

@@ -69,7 +69,9 @@ define([
             it('Should transform regular properties', function () {
                 var data = {
                         products_count: 123,
-                        conditions_encoded: '[]'
+                        conditions_encoded: '[]',
+                        condition_option: 'condition',
+                        sort_order: 'position'
                     },
                     config = {
                         html_variable: 'myhtml'
@@ -85,6 +87,9 @@ define([
                 expect(result.myhtml).toContain(' id_path=""');
                 expect(result.myhtml).toContain(' show_pager="0"');
                 expect(result.myhtml).toContain(' type_name="Catalog Products List"');
+                expect(result.myhtml).toContain(' condition_option="condition');
+                expect(result.myhtml).toContain(' sort_order="position');
+                expect(result.myhtml).toContain(' condition_option_value=""');
             });
             it('Should encode conditions_encoded', function () {
                 var data = {
@@ -105,12 +110,24 @@ define([
                 expect(result.myhtml).toContain(' show_pager="0"');
                 expect(result.myhtml).toContain(' type_name="Catalog Products List"');
             });
+            it('Should not add empty sort_order attribute', function () {
+                var data = {
+                        products_count: 123,
+                        conditions_encoded: '[]'
+                    },
+                    config = {
+                        html_variable: 'myhtml'
+                    },
+                    result = model.toDom(data, config);
+                expect(result.myhtml).not.toContain('sort_order');
+            });
         });
         describe('fromDom', function () {
             it('Should parse regular properties without conditions_encoded', function () {
                 var expected = {
                         products_count: '123',
-                        conditions_encoded: ''
+                        conditions_encoded: '',
+                        condition_option: 'condition'
                     },
                     config = {
                         html_variable: 'myhtml'
@@ -122,6 +139,7 @@ define([
 
                 expect(result.products_count).toBe(expected.products_count);
                 expect(result.conditions_encoded).toBe(expected.conditions_encoded);
+                expect(result.condition_option).toBe(expected.condition_option);
                 // assert the automatically added properties do not get returned.
                 expect(result.type).toBe(undefined);
                 expect(result.id_path).toBe(undefined);