Merge remote-tracking branch 'origin/MAGETWO-53342' into MAGETWO-53850

Author: mslabko

app/code/Magento/CatalogImportExport/Model/Import/Product.php

@@ -16,7 +16,6 @@
 use Magento\ImportExport\Model\Import;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingError;
 use Magento\ImportExport\Model\Import\ErrorProcessing\ProcessingErrorAggregatorInterface;
-use Magento\Catalog\Api\Data\ProductInterface;
 use Magento\ImportExport\Model\Import\Entity\AbstractEntity;
 
 /**
@@ -104,6 +103,16 @@ class Product extends \Magento\ImportExport\Model\Import\Entity\AbstractEntity
      */
     const COL_CATEGORY = 'categories';
 
+    /**
+     * Column product visibility.
+     */
+    const COL_VISIBILITY = 'visibility';
+
+    /**
+     * Column product visibility value.
+     */
+    const COL_VALUE_VISIBILITY_NON_VISIBLE = 'Not Visible Individually';
+
     /**
      * Column product sku.
      */
@@ -2286,7 +2295,8 @@ public function validateRow(array $rowData, $rowNum)
         }
         // validate custom options
         $this->getOptionEntity()->validateRow($rowData, $rowNum);
-        if (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME])) {
+
+        if ($this->isNeedToValidateUrlKey($rowData)) {
             $urlKey = $this->getUrlKey($rowData);
             $storeCodes = empty($rowData[self::COL_STORE_VIEW_CODE])
                 ? array_flip($this->storeResolver->getStoreCodeToId())
@@ -2308,6 +2318,17 @@ public function validateRow(array $rowData, $rowNum)
         return !$this->getErrorAggregator()->isRowInvalid($rowNum);
     }
 
+    /**
+     * @param array $rowData
+     * @return bool
+     */
+    private function isNeedToValidateUrlKey($rowData)
+    {
+        return (!empty($rowData[self::URL_KEY]) || !empty($rowData[self::COL_NAME]))
+            && (empty($rowData[self::COL_VISIBILITY])
+            || $rowData[self::COL_VISIBILITY] !== self::COL_VALUE_VISIBILITY_NON_VISIBLE);
+    }
+
     /**
      * Prepare new SKU data
      *

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/Group.php

@@ -113,7 +113,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId)
         $collection = $this->productFactory->create()
             ->getCollection()
             ->addCategoryIds()
-            ->addAttributeToSelect(['name', 'url_path', 'url_key'])
+            ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addWebsiteFilter($websiteIds);
         foreach ($collection as $product) {
             /** @var \Magento\Catalog\Model\Product $product */

app/code/Magento/CatalogUrlRewrite/Model/Category/Plugin/Store/View.php

@@ -100,7 +100,7 @@ protected function generateProductUrls($websiteId, $originWebsiteId, $storeId)
         $collection = $this->productFactory->create()
             ->getCollection()
             ->addCategoryIds()
-            ->addAttributeToSelect(['name', 'url_path', 'url_key'])
+            ->addAttributeToSelect(['name', 'url_path', 'url_key', 'visibility'])
             ->addWebsiteFilter($websiteIds);
         foreach ($collection as $product) {
             $product->setStoreId($storeId);

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

@@ -12,6 +12,7 @@
 use Magento\CatalogUrlRewrite\Model\Product\AnchorUrlRewriteGenerator;
 use Magento\CatalogUrlRewrite\Service\V1\StoreViewService;
 use Magento\Store\Model\Store;
+use Magento\Catalog\Model\Product\Visibility;
 
 /**
  * Class ProductUrlRewriteGenerator
@@ -98,6 +99,10 @@ private function getAnchorUrlRewriteGenerator()
      */
     public function generate(Product $product)
     {
+        if ($product->getVisibility() == Visibility::VISIBILITY_NOT_VISIBLE) {
+            return [];
+        }
+
         $this->product = $product;
         $storeId = $this->product->getStoreId();
 

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

@@ -93,6 +93,7 @@ class AfterImportDataObserver implements ObserverInterface
         'url_key',
         'url_path',
         'name',
+        'visibility',
     ];
 
     /**
@@ -221,6 +222,9 @@ protected function setStoreToProduct(\Magento\Catalog\Model\Product $product, ar
      */
     protected function addProductToImport($product, $storeId)
     {
+        if ($product->getVisibility() == ImportProduct::COL_VALUE_VISIBILITY_NON_VISIBLE) {
+            return $this;
+        }
         if (!isset($this->products[$product->getId()])) {
             $this->products[$product->getId()] = [];
         }
@@ -321,6 +325,9 @@ protected function categoriesUrlRewriteGenerate()
             foreach ($productsByStores as $storeId => $product) {
                 foreach ($this->categoryCache[$productId] as $categoryId) {
                     $category = $this->import->getCategoryProcessor()->getCategoryById($categoryId);
+                    if ($category->getParentId() == Category::TREE_ROOT_ID) {
+                        continue;
+                    }
                     $requestPath = $this->productUrlPathGenerator->getUrlPathWithSuffix($product, $storeId, $category);
                     $urls[] = $this->urlRewriteFactory->create()
                         ->setEntityType(ProductUrlRewriteGenerator::ENTITY_TYPE)

app/code/Magento/CatalogUrlRewrite/Observer/ProductProcessUrlRewriteSavingObserver.php

@@ -47,14 +47,15 @@ public function execute(\Magento\Framework\Event\Observer $observer)
         $product = $observer->getEvent()->getProduct();
 
         $isChangedWebsites = $product->getIsChangedWebsites();
-        if ($product->dataHasChangedFor('url_key') || $product->getIsChangedCategories() || $isChangedWebsites) {
+        if ($product->dataHasChangedFor('url_key') || $product->getIsChangedCategories() || $isChangedWebsites
+            || $product->dataHasChangedFor('visibility')) {
             if ($isChangedWebsites) {
                 $this->urlPersist->deleteByData([
                     UrlRewrite::ENTITY_ID => $product->getId(),
                     UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
                 ]);
             }
-            if ($product->getVisibility() != Visibility::VISIBILITY_NOT_VISIBLE) {
+            if (!in_array($product->getOrigData('visibility'), $product->getVisibleInSiteVisibilities())) {
                 $this->urlPersist->replace($this->productUrlRewriteGenerator->generate($product));
             }
         }

app/code/Magento/CatalogUrlRewrite/Observer/UrlRewriteHandler.php

@@ -70,6 +70,7 @@ public function generateProductUrlRewrites(Category $category)
             $collection = $this->productCollectionFactory->create()
                 ->setStoreId($storeId)
                 ->addIdFilter($category->getAffectedProductIds())
+                ->addAttributeToSelect('visibility')
                 ->addAttributeToSelect('name')
                 ->addAttributeToSelect('url_key')
                 ->addAttributeToSelect('url_path');
@@ -104,6 +105,7 @@ public function getCategoryProductsUrlRewrites(Category $category, $storeId, $sa
         /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $productCollection */
         $productCollection = $category->getProductCollection()
             ->addAttributeToSelect('name')
+            ->addAttributeToSelect('visibility')
             ->addAttributeToSelect('url_key')
             ->addAttributeToSelect('url_path');
         $productUrls = [];