MAGETWO-91433: ProductListing: Grid view is getting changed to List view when user adding product from wishlist section.

Author: fascinosum

app/code/Magento/Wishlist/Controller/Index/Remove.php

@@ -5,13 +5,13 @@
  */
 namespace Magento\Wishlist\Controller\Index;
 
-use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
 use Magento\Framework\App\Action;
 use Magento\Framework\Data\Form\FormKey\Validator;
 use Magento\Framework\Exception\NotFoundException;
 use Magento\Framework\Controller\ResultFactory;
 use Magento\Wishlist\Controller\WishlistProviderInterface;
 use Magento\Wishlist\Model\Item;
+use Magento\Wishlist\Model\Product\AttributeValueProvider;
 
 /**
  * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -29,26 +29,26 @@ class Remove extends \Magento\Wishlist\Controller\AbstractIndex
     protected $formKeyValidator;
 
     /**
-     * @var ProductCollectionFactory
+     * @var AttributeValueProvider
      */
-    private $productCollectionFactory;
+    private $attributeValueProvider;
 
     /**
      * @param Action\Context $context
      * @param WishlistProviderInterface $wishlistProvider
      * @param Validator $formKeyValidator
-     * @param ProductCollectionFactory|null $productCollectionFactory
+     * @param AttributeValueProvider|null $attributeValueProvider
      */
     public function __construct(
         Action\Context $context,
         WishlistProviderInterface $wishlistProvider,
         Validator $formKeyValidator,
-        ProductCollectionFactory $productCollectionFactory = null
+        AttributeValueProvider $attributeValueProvider = null
     ) {
         $this->wishlistProvider = $wishlistProvider;
         $this->formKeyValidator = $formKeyValidator;
-        $this->productCollectionFactory = $productCollectionFactory
-            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(ProductCollectionFactory::class);
+        $this->attributeValueProvider = $attributeValueProvider
+            ?: \Magento\Framework\App\ObjectManager::getInstance()->get(AttributeValueProvider::class);
         parent::__construct($context);
     }
 
@@ -79,15 +79,12 @@ public function execute()
         try {
             $item->delete();
             $wishlist->save();
-            $product = $this->productCollectionFactory
-                ->create()
-                ->addIdFilter($item->getProductId())
-                ->addAttributeToSelect('name')
-                ->getFirstItem();
+            $productName = $this->attributeValueProvider
+                ->getRawAttributeValue($item->getProductId(), 'name');
             $this->messageManager->addComplexSuccessMessage(
                 'removeWishlistItemSuccessMessage',
                 [
-                    'product_name' => $product->getName()
+                    'product_name' => $productName,
                 ]
             );
         } catch (\Magento\Framework\Exception\LocalizedException $e) {

app/code/Magento/Wishlist/Model/Product/AttributeValueProvider.php

@@ -0,0 +1,57 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Wishlist\Model\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/**
+ * Provides existing attribute value for a product entity.
+ */
+class AttributeValueProvider
+{
+    /**
+     * @var ProductCollectionFactory
+     */
+    private $productCollectionFactory;
+
+    /**
+     * @param ProductCollectionFactory $productCollectionFactory
+     */
+    public function __construct(
+        ProductCollectionFactory $productCollectionFactory
+    ) {
+        $this->productCollectionFactory = $productCollectionFactory;
+    }
+
+    /**
+     * Provides existing raw attribute value by the attribute code of the product entity.
+     *
+     * @param int $productId
+     * @param string $attributeCode
+     * @param int|null $storeId
+     * @return null|string
+     * @throws NoSuchEntityException
+     */
+    public function getRawAttributeValue(int $productId, string $attributeCode, int $storeId = null):? string
+    {
+
+        $collection = $this->productCollectionFactory->create();
+        $collection->addIdFilter($productId)
+            ->addStoreFilter($storeId)
+            ->addAttributeToSelect($attributeCode);
+
+        $data = $collection->getConnection()->fetchRow($collection->getSelect());
+
+        if (!array_key_exists($attributeCode, $data)) {
+            throw new NoSuchEntityException(__('An attribute value of "%1" does not exist.', $attributeCode));
+        }
+
+        return $data[$attributeCode];
+    }
+}