Merge pull request #351 from magento-obsessive-owls/PB-315

[Owls] PB-315 [PB-1.1.1 Backport] Products lose their conditions after upgrade

Author: davemacaulay

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

@@ -46,10 +46,13 @@ export default class WidgetDirective extends BaseWidgetDirective {
             id_path: "",
             show_pager: 0,
             products_count: data.products_count,
-            sort_order: data.sort_order,
             type_name: "Catalog Products List",
             conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
-        };
+        } as { [key: string]: any; };
+
+        if (data.sort_order) {
+            attributes.sort_order = data.sort_order;
+        }
 
         if (attributes.conditions_encoded.length === 0) {
             return data;

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

@@ -69,7 +69,8 @@ define([
             it('Should transform regular properties', function () {
                 var data = {
                         products_count: 123,
-                        conditions_encoded: '[]'
+                        conditions_encoded: '[]',
+                        sort_order: 'date_newest_top'
                     },
                     config = {
                         html_variable: 'myhtml'
@@ -85,6 +86,7 @@ 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(' sort_order="date_newest_top');
             });
             it('Should encode conditions_encoded', function () {
                 var data = {
@@ -105,6 +107,18 @@ 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 () {