ACP2E-3282: When we unassign products from the shared catalog, the wishlist products are not being cleared

Adiglo70550 · glo60612 · commit 4b08d4fa5950 · 2024-12-10T16:58:45.000+05:30
diff --git a/app/code/Magento/Wishlist/CustomerData/Wishlist.php b/app/code/Magento/Wishlist/CustomerData/Wishlist.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Wishlist\CustomerData;
 
@@ -85,7 +85,8 @@ public function getSectionData()
         return [
             'counter' => $counter,
             'items' => $counter ? $this->getItems() : [],
-            'websiteId' => $this->storeManager->getWebsite()->getId()
+            'websiteId' => $this->storeManager->getWebsite()->getId(),
+            'storeId' => $this->storeManager->getStore()->getId()
         ];
     }
 
diff --git a/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php b/app/code/Magento/Wishlist/Model/ResourceModel/Item/Collection/Grid.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Wishlist\Model\ResourceModel\Item\Collection;
@@ -124,6 +124,8 @@ protected function _assignProducts()
                 $item->setProductName($product->getName());
                 $item->setName($product->getName());
                 $item->setPrice($product->getPrice());
+            } else {
+                $this->removeItemByKey($item->getId());
             }
         }
 
diff --git a/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php b/app/code/Magento/Wishlist/Test/Unit/CustomerData/WishlistTest.php
@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 declare(strict_types=1);
 
@@ -15,6 +15,7 @@
 use Magento\Catalog\Model\Product\Type\AbstractType;
 use Magento\Framework\App\ViewInterface;
 use Magento\Framework\Pricing\Render;
+use Magento\Store\Api\Data\StoreInterface;
 use Magento\Store\Model\StoreManagerInterface;
 use Magento\Wishlist\Block\Customer\Sidebar;
 use Magento\Wishlist\CustomerData\Wishlist;
@@ -55,6 +56,9 @@ class WishlistTest extends TestCase
     /** @var WebsiteInterface|MockObject */
     private $websiteMock;
 
+    /** @var StoreInterface|MockObject */
+    private $storeMock;
+
     /** @var ImageFactory|MockObject */
     private $imageHelperFactory;
 
@@ -93,6 +97,11 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->getMockForAbstractClass();
 
+        $this->storeMock = $this->getMockBuilder(StoreInterface::class)
+            ->onlyMethods(['getId',])
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->model = new Wishlist(
             $this->wishlistHelperMock,
             $this->sidebarMock,
@@ -127,10 +136,18 @@ public function testGetSectionData()
             ->method('getWebsite')
             ->willReturn($this->websiteMock);
 
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
         $this->websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
 
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
         $result = [
             'counter' => __('1 item'),
             'items' => [
@@ -153,7 +170,8 @@ public function testGetSectionData()
                     'delete_item_params' => $itemRemoveParams,
                 ],
             ],
-            'websiteId' => 1
+            'websiteId' => 1,
+            'storeId' => 1
         ];
 
         /** @var Item|MockObject $itemMock */
@@ -322,10 +340,18 @@ public function testGetSectionDataWithTwoItems()
             ->method('getWebsite')
             ->willReturn($this->websiteMock);
 
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
         $this->websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn(1);
 
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(1);
+
         $result = [
             'counter' =>  __('%1 items', count($items)),
             'items' => [
@@ -366,7 +392,8 @@ public function testGetSectionDataWithTwoItems()
                     'delete_item_params' => $itemRemoveParams,
                 ],
             ],
-            'websiteId' => 1
+            'websiteId' => 1,
+            'storeId' => 1
         ];
 
         $this->wishlistHelperMock->expects($this->once())
@@ -508,14 +535,23 @@ public function testGetSectionDataWithoutItems()
             ->method('getWebsite')
             ->willReturn($this->websiteMock);
 
+        $this->storeManagerMock->expects($this->once())
+            ->method('getStore')
+            ->willReturn($this->storeMock);
+
         $this->websiteMock->expects($this->once())
             ->method('getId')
             ->willReturn(null);
 
+        $this->storeMock->expects($this->once())
+            ->method('getId')
+            ->willReturn(null);
+
         $result = [
             'counter' =>  null,
             'items' => [],
-            'websiteId' =>null
+            'websiteId' =>null,
+            'storeId' => null
         ];
 
         $this->wishlistHelperMock->expects($this->once())
diff --git a/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js b/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.js
@@ -1,6 +1,6 @@
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2015 Adobe
+ * All Rights Reserved.
  */
 
 define([
@@ -17,15 +17,16 @@ define([
         initialize: function () {
             this._super();
             this.wishlist = customerData.get('wishlist');
+            this.company = customerData.get('company');
             if (!wishlistReloaded
                 && !_.isEmpty(this.wishlist())
                 // Expired section names are reloaded on page load.
                 && _.indexOf(customerData.getExpiredSectionNames(), 'wishlist') === -1
                 && window.checkout
-                && window.checkout.websiteId
-                && window.checkout.websiteId !== this.wishlist().websiteId
+                && window.checkout.storeId
+                && (window.checkout.storeId !== this.wishlist().storeId || this.company().is_enabled)
             ) {
-                //set count to 0 to prevent "wishlist" blocks and count to show with wrong count and items
+                //set count to 0 to prevent "Wishlist products" blocks and count to show with wrong count and items
                 this.wishlist().counter = 0;
                 customerData.invalidate(['wishlist']);
                 customerData.reload(['wishlist'], false);
diff --git a/dev/tests/js/jasmine/tests/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.test.js b/dev/tests/js/jasmine/tests/app/code/Magento/Wishlist/view/frontend/web/js/view/wishlist.test.js
@@ -20,6 +20,7 @@ define([
     describe('Magento_Wishlist/js/view/wishlist', function () {
         var wishlistComponent,
             mockWishlist,
+            mockCompany,
             mockCustomerData,
             injector;
 
@@ -28,14 +29,23 @@ define([
 
             mockWishlist = {
                 counter: 1,
-                items: [],
-                websiteId: 1
+                items: [{ id: 1, name: 'Test Product' }],
+                storeId: 1
             };
+
+            mockCompany = {
+                is_enabled: true
+            };
+
             injector.clean();
 
             mockCustomerData = {
-                get: jasmine.createSpy('customerDataGet').and.returnValue(function () {
-                    return mockWishlist;
+                get: jasmine.createSpy('customerDataGet').and.callFake(function (key) {
+                    if (key === 'wishlist') {
+                        return function () { return mockWishlist; };
+                    } else if (key === 'company') {
+                        return function () { return mockCompany; };
+                    }
                 }),
                 reload: jasmine.createSpy('customerDataReload'),
                 invalidate: jasmine.createSpy(),
@@ -75,20 +85,32 @@ define([
                 expect(mockCustomerData.get).toHaveBeenCalledWith('wishlist');
             });
 
-            it('should invalidate wishlist if websiteIds do not match', async function () {
-                window.checkout = { websiteId: 2 };
+            it('should call customerData.get with "company"', async function () {
+                expect(mockCustomerData.get).toHaveBeenCalledWith('company');
+            });
+
+            it('should invalidate wishlist if storeIds do not match', async function () {
+                window.checkout = { storeId: 2 };
                 await wishlistComponent.initialize();
                 expect(mockCustomerData.invalidate).toHaveBeenCalledWith(['wishlist']);
             });
 
-            it('should not reload wishlist if websiteIds match', async function () {
-                window.checkout = { websiteId: 1 };
+            it('should not reload wishlist if storeIds match and company is disabled', async function () {
+                window.checkout = { storeId: 1 };
+                mockCompany.is_enabled = false;
                 await wishlistComponent.initialize();
-                expect(mockCustomerData.reload).not.toHaveBeenCalled();
+                expect(mockCustomerData.reload).not.toHaveBeenCalledWith(['wishlist'], false);
+            });
+
+            it('should reload wishlist if storeIds do not match', async function () {
+                window.checkout = { storeId: 2 };
+                await wishlistComponent.initialize();
+                expect(mockCustomerData.reload).toHaveBeenCalledWith(['wishlist'], false);
             });
 
-            it('should reload wishlist if websiteIds do not match', async function () {
-                window.checkout = { websiteId: 2 };
+            it('should reload wishlist if storeIds match and company is enabled', async function () {
+                window.checkout = { storeId: 1 };
+                mockCompany.is_enabled = true;
                 await wishlistComponent.initialize();
                 expect(mockCustomerData.reload).toHaveBeenCalledWith(['wishlist'], false);
             });
