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

Author: eug123

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

@@ -13,7 +13,8 @@ define([
     var serializer = new ConditionsDataNormalizer();
 
     return function (data, attribute) {
-        var pairs = {};
+        var pairs = {},
+            conditions = '';
 
         /*
          * The Condition Rule Tree is not a UI component and doesn't provide good data.
@@ -33,27 +34,25 @@ define([
         /*
          * Add pairs in case conditions source is not rules configurator
          */
-        if (data.condition_option !== 'condition') {
-            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]'] = conditionValue;
+        if (data['condition_option'] !== 'condition') {
+            pairs['parameters[' + attribute + '][1--1][operator]'] = data[data['condition_option'] + '-condition_operator'] ?
+                data[data['condition_option'] + '-condition_operator'] :
+                '==';
+            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]'] = _.isString(data[data['condition_option']]) ?
+                data[data['condition_option']].trim() :
+                '';
         }
 
         if (!_.isEmpty(pairs)) {
-            var conditions = JSON.stringify(serializer.normalize(pairs).parameters[attribute]);
+            conditions = JSON.stringify(serializer.normalize(pairs).parameters[attribute]);
             data['conditions_encoded'] = conditions;
-            objectUtils.nested(data,attribute, conditions);
+            objectUtils.nested(data, attribute, conditions);
         }
     };
 });