MC-30099: Inventory Sources and Stock is breaking the Category and CMS

Author: victor-v-rad

app/code/Magento/CatalogWidget/Model/Rule/Condition/Product.php

@@ -250,7 +250,7 @@ protected function addNotGlobalAttribute(
     public function getMappedSqlField()
     {
         $result = '';
-        if (in_array($this->getAttribute(), ['category_ids', 'sku'])) {
+        if (in_array($this->getAttribute(), ['category_ids', 'sku', 'attribute_set_id'])) {
             $result = parent::getMappedSqlField();
         } elseif (isset($this->joinedAttributes[$this->getAttribute()])) {
             $result = $this->joinedAttributes[$this->getAttribute()];

app/code/Magento/Rule/Model/Condition/Product/AbstractProduct.php

@@ -625,6 +625,8 @@ public function getMappedSqlField()
             $mappedSqlField = $this->getEavAttributeTableAlias() . '.value';
         } elseif ($this->getAttribute() == 'category_ids') {
             $mappedSqlField = 'e.entity_id';
+        } elseif ($this->getAttribute() == 'attribute_set_id') {
+            $mappedSqlField = $mappedSqlField = 'e.attribute_set_id';
         } else {
             $mappedSqlField = parent::getMappedSqlField();
         }