ACP2E-3380: [GraphQl] Wishlist items are visible via GraphQl but not visible on storefront

Author: aplapana

app/code/Magento/WishlistGraphQl/Model/Resolver/WishlistItems.php

@@ -61,6 +61,10 @@ public function resolve(
         /** @var Wishlist $wishlist */
         $wishlist = $value['model'];
 
+        if ($context->getExtensionAttributes()->getStore() instanceof StoreInterface) {
+            $args['store_id'] = $context->getExtensionAttributes()->getStore()->getStoreId();
+        }
+
         /** @var WishlistItemCollection $wishlistItemCollection */
         $wishlistItemsCollection = $this->getWishListItems($wishlist, $args);
         $wishlistItems = $wishlistItemsCollection->getItems();
@@ -100,12 +104,15 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem
 
         /** @var WishlistItemCollection $wishlistItemCollection */
         $wishlistItemCollection = $this->wishlistItemCollectionFactory->create();
-        $wishlistItemCollection
-            ->addWishlistFilter($wishlist)
-            ->addStoreFilter(array_map(function (StoreInterface $store) {
+        $wishlistItemCollection->addWishlistFilter($wishlist);
+        if (isset($args['store_id'])) {
+            $wishlistItemCollection->addStoreFilter($args['store_id']);
+        } else {
+            $wishlistItemCollection->addStoreFilter(array_map(function (StoreInterface $store) {
                 return $store->getId();
-            }, $this->storeManager->getStores()))
-            ->setVisibilityFilter();
+            }, $this->storeManager->getStores()));
+        }
+        $wishlistItemCollection->setVisibilityFilter();
         if ($currentPage > 0) {
             $wishlistItemCollection->setCurPage($currentPage);
         }
@@ -115,4 +122,4 @@ private function getWishListItems(Wishlist $wishlist, array $args): WishlistItem
         }
         return $wishlistItemCollection;
     }
-}
+}