ACP2E-3770: No information when deleting last option from bundle

Author: o-dubovyk

app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php

@@ -8,6 +8,7 @@
 use Magento\Bundle\Api\Data\OptionInterfaceFactory as OptionFactory;
 use Magento\Bundle\Api\Data\LinkInterfaceFactory as LinkFactory;
 use Magento\Catalog\Api\Data\ProductCustomOptionInterfaceFactory;
+use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface as ProductRepository;
 use Magento\Store\Model\StoreManagerInterface as StoreManager;
 use Magento\Framework\App\RequestInterface;
@@ -108,18 +109,13 @@ public function afterInitialize(
             }
 
             if (!$result['bundle_selections']) {
-                $extension = $product->getExtensionAttributes();
-                $extension->setBundleProductOptions([]);
-                $product->setExtensionAttributes($extension);
-                $product->setDropOptions(true);
+                $this->resetBundleProductOptions($product);
             }
 
             $this->processBundleOptionsData($product);
             $this->processDynamicOptionsData($product);
         } elseif (!$compositeReadonly) {
-            $extension = $product->getExtensionAttributes();
-            $extension->setBundleProductOptions([]);
-            $product->setExtensionAttributes($extension);
+            $this->resetBundleProductOptions($product);
         }
 
         $affectProductSelections = (bool)$this->request->getPost('affect_bundle_product_selections');
@@ -240,4 +236,18 @@ private function buildLink(
 
         return $link;
     }
+
+    /**
+     * Resets bundle product options inside product extension attributes
+     *
+     * @param ProductInterface $product
+     * @return void
+     */
+    private function resetBundleProductOptions(ProductInterface $product) : void
+    {
+        $extension = $product->getExtensionAttributes();
+        $extension->setBundleProductOptions([]);
+        $product->setExtensionAttributes($extension);
+        $product->setDropOptions(true);
+    }
 }

app/code/Magento/Bundle/Model/Product/SaveHandler.php

@@ -97,8 +97,7 @@ public function execute($entity, $arguments = [])
         $bundleProductOptions = $entity->getExtensionAttributes()->getBundleProductOptions() ?: [];
         //Only processing bundle products.
         if ($entity->getTypeId() !== Type::TYPE_CODE
-            || empty($bundleProductOptions)
-            && !$entity->getDropOptions()
+            || (empty($bundleProductOptions) && !$entity->getDropOptions())
         ) {
             return $entity;
         }