ACP2E-2549: regenerate product url rewrites when root category is switched and on default is not visible.

Author: alzota

app/code/Magento/CatalogUrlRewrite/Model/ProductScopeRewriteGenerator.php

@@ -170,7 +170,7 @@ public function generateForGlobalScope($productCategories, Product $product, $ro
                     $productId,
                     Product::ENTITY
                 )) {
-                    if (count($visibleForStores) == 0 || in_array((int)$id, $visibleForStores)) {
+                    if (count($visibleForStores) === 0 || in_array((int)$id, $visibleForStores)) {
                         $mergeDataProvider->merge(
                             $this->generateForSpecificStoreView(
                                 $id,
@@ -182,7 +182,7 @@ public function generateForGlobalScope($productCategories, Product $product, $ro
                         );
                     }
                 } else {
-                    if (count($visibleForStores) == 0 || in_array((int)$id, $visibleForStores)) {
+                    if (count($visibleForStores) === 0 || in_array((int)$id, $visibleForStores)) {
                         $scopedProduct = $this->productRepository->getById($productId, false, $id);
                         $mergeDataProvider->merge(
                             $this->generateForSpecificStoreView(

app/code/Magento/CatalogUrlRewrite/Model/ProductUrlRewriteGenerator.php

@@ -12,6 +12,7 @@
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Framework\App\ObjectManager;
 use Magento\Catalog\Model\Product\Visibility;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 
 /**
@@ -146,6 +147,7 @@ public function generate(Product $product, $rootCategoryId = null)
         if ($product->getVisibility() == Visibility::VISIBILITY_NOT_VISIBLE) {
             $visibleForStores = $this->visibleForStores->execute($product);
             if (count($visibleForStores) === 0 ||
+                $product->getStoreId() !== Store::DEFAULT_STORE_ID &&
                 !in_array($product->getStoreId(), $visibleForStores)
             ) {
                 return [];