PB-207: Empty "Category" or "SKU" condition option causes error on save

Author: eug123

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

@@ -278,9 +278,6 @@
             <group value="pagebuilder"/>
             <group value="pagebuilder-products"/>
             <group value="pagebuilder-productsCarousel"/>
-            <skip>
-                <issueId value="PB-207"/>
-            </skip>
         </annotations>
         <actionGroup ref="openPageBuilderEditPanelByIndex" stepKey="openEditPanel" after="dragProductsIntoStage">
             <argument name="contentType" value="PageBuilderProductsContentType"/>

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

@@ -37,14 +37,17 @@ define([
             var conditionOperator = data[data.condition_option + '-condition_operator']
                 ? data[data.condition_option + '-condition_operator']
                 : "==";
+            var conditionValue = typeof data[data.condition_option] === 'string'
+                ? data[data.condition_option].trim()
+                : '';
             pairs['parameters[' + attribute + '][1--1][operator]'] = conditionOperator;
             pairs['parameters[' + attribute + '][1--1][type]'] = "Magento\\CatalogWidget\\Model\\Rule\\Condition\\Product";
             pairs['parameters[' + attribute + '][1][aggregator]'] = "all";
             pairs['parameters[' + attribute + '][1][new_child]'] = "";
             pairs['parameters[' + attribute + '][1][type]'] = "Magento\\CatalogWidget\\Model\\Rule\\Condition\\Combine";
             pairs['parameters[' + attribute + '][1][value]'] = "1";
             pairs['parameters[' + attribute + '][1--1][attribute]'] = data.condition_option;
-            pairs['parameters[' + attribute + '][1--1][value]'] = data[data.condition_option].trim();
+            pairs['parameters[' + attribute + '][1--1][value]'] = conditionValue;
         }
 
         if (!_.isEmpty(pairs)) {

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

@@ -53,11 +53,15 @@ export default class WidgetDirective extends BaseWidgetDirective {
             products_count: data.carousel_products_count,
             sort_order: data.sort_order,
             condition_option: data.condition_option,
-            condition_option_value: this.encodeWysiwygCharacters(data[data.condition_option] || ""),
+            condition_option_value: "",
             type_name: "Catalog Products Carousel",
             conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
         };
 
+        if (typeof data[data.condition_option] === "string") {
+            attributes.condition_option_value = this.encodeWysiwygCharacters(data[data.condition_option]);
+        }
+
         if (attributes.conditions_encoded.length === 0) {
             return data;
         }

app/code/Magento/PageBuilder/view/adminhtml/web/js/form/provider/conditions-data-processor.js

@@ -53,11 +53,15 @@ export default class WidgetDirective extends BaseWidgetDirective {
             products_count: data.products_count,
             sort_order: data.sort_order,
             condition_option: data.condition_option,
-            condition_option_value: this.encodeWysiwygCharacters(data[data.condition_option] || ""),
+            condition_option_value: "",
             type_name: "Catalog Products List",
             conditions_encoded: this.encodeWysiwygCharacters(data.conditions_encoded || ""),
         };
 
+        if (typeof data[data.condition_option] === "string") {
+            attributes.condition_option_value = this.encodeWysiwygCharacters(data[data.condition_option]);
+        }
+
         if (attributes.conditions_encoded.length === 0) {
             return data;
         }