#422: Adding Conditions Combination to Conditions Filter Will Cause Server Errors, Condition Filter to Break, & Infinite Loading Mask - Added QA fixes part III

Author: Lukasz Borowiec

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

@@ -36,10 +36,14 @@ define([
          */
         _.each(pairs, function (element, key) {
             var keyIds = key.match(/[\d?-]+/g),
-                nextPairsExistKey = 'parameters[condition_source][NEXT_ITEM--1][type]';
+              combineElement = 'Magento\\CatalogWidget\\Model\\Rule\\Condition\\Combine',
+              nextPairsFirstKey = 'parameters[condition_source][NEXT_ITEM--1][type]',
+              nextPairsSecondKey = 'parameters[condition_source][NEXT_ITEM--2][type]';
 
-            if (keyIds !== null && element === 'Magento\\CatalogWidget\\Model\\Rule\\Condition\\Combine') {
-                if (pairs[nextPairsExistKey.replace('NEXT_ITEM', keyIds[0])] === undefined) {
+            if (keyIds !== null && element === combineElement) {
+                if (pairs[nextPairsFirstKey.replace('NEXT_ITEM', keyIds[0])] === undefined ||
+                    pairs[nextPairsFirstKey.replace('NEXT_ITEM', keyIds[0])] === combineElement &&
+                    pairs[nextPairsSecondKey.replace('NEXT_ITEM', keyIds[0])] === undefined) {
                     pairs[key] = '';
                 }
             }