Merge branch '2.4-develop' into 247beta3_jan

Indraniks · web-flow · commit ca7557e7b358 · 2024-02-15T15:12:14.000+05:30
diff --git a/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ChildSku.php b/app/code/Magento/ConfigurableProductGraphQl/Model/Wishlist/ChildSku.php
@@ -36,8 +36,17 @@ public function resolve(
 
         /** @var Product $product */
         $product = $value['model'];
-        $optionProduct = $product->getCustomOption('simple_product')->getProduct();
 
-        return $optionProduct->getSku();
+        /** to handle no child sku selected at add to wishlist time */
+        $optionsArray = json_decode($product->getCustomOption('info_buyRequest')->getValue(), true);
+        $superAttribute = $optionsArray['super_attribute'];
+        $totalSelected = array_filter($superAttribute);
+
+        if (count($totalSelected) > 0) {
+            $optionProduct = $product->getCustomOption('simple_product')->getProduct();
+            return $optionProduct->getSku();
+        } else {
+            return "";
+        }
     }
 }
diff --git a/app/code/Magento/CustomerGraphQl/etc/di.xml b/app/code/Magento/CustomerGraphQl/etc/di.xml
@@ -30,9 +30,6 @@
                 <item name="Magento\Customer\Model\Address" xsi:type="object">
                     Magento\CustomerGraphQl\Model\Resolver\Cache\Customer\Address\TagsStrategy
                 </item>
-                <item name="Magento\Newsletter\Model\Subscriber" xsi:type="object">
-                    Magento\CustomerGraphQl\Model\Resolver\Cache\Subscriber\TagsStrategy
-                </item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml b/app/code/Magento/CustomerGraphQl/etc/graphql/di.xml
@@ -176,9 +176,6 @@
                 <item name="Magento\CustomerGraphQl\Model\Resolver\Customer" xsi:type="string">
                     Magento\CustomerGraphQl\Model\Resolver\Cache\Customer\ResolverCacheIdentity
                 </item>
-                <item name="Magento\CustomerGraphQl\Model\Resolver\IsSubscribed" xsi:type="string">
-                    Magento\CustomerGraphQl\Model\Resolver\Cache\Subscriber\ResolverCacheIdentity
-                </item>
             </argument>
         </arguments>
     </type>
@@ -208,9 +205,6 @@
                 <item name="Magento\CustomerGraphQl\Model\Resolver\Customer" xsi:type="array">
                     <item name="current_customer_id" xsi:type="string">Magento\CustomerGraphQl\Model\Resolver\CacheKey\FactorProvider\CurrentCustomerId</item>
                 </item>
-                <item name="Magento\CustomerGraphQl\Model\Resolver\IsSubscribed" xsi:type="array">
-                    <item name="parent_customer_entity_id" xsi:type="string">Magento\CustomerGraphQl\Model\Resolver\CacheKey\FactorProvider\ParentCustomerEntityId</item>
-                </item>
             </argument>
         </arguments>
     </type>
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -136,7 +136,7 @@ type Customer @doc(description: "Defines the customer name, addresses, and other
     date_of_birth: String @doc(description: "The customer's date of birth.")
     taxvat: String @doc(description: "The customer's Value-added tax (VAT) number (for corporate customers).")
     id: Int @doc(description: "The ID assigned to the customer.") @deprecated(reason: "`id` is not needed as part of `Customer`, because on the server side, it can be identified based on the customer token used for authentication. There is no need to know customer ID on the client side.")
-    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter.") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\IsSubscribed")
+    is_subscribed: Boolean @doc(description: "Indicates whether the customer is subscribed to the company's newsletter.") @resolver(class: "\\Magento\\NewsletterGraphQl\\Model\\Resolver\\IsSubscribed")
     addresses: [CustomerAddress] @doc(description: "An array containing the customer's shipping and billing addresses.") @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\CustomerAddresses")
     gender: Int @doc(description: "The customer's gender (Male - 1, Female - 2).")
     custom_attributes(attributeCodes: [ID!]): [AttributeValueInterface] @doc(description: "Customer's custom attributes.") @resolver(class: "Magento\\CustomerGraphQl\\Model\\Resolver\\CustomAttributeFilter")
diff --git a/app/code/Magento/NewsletterGraphQl/Model/Resolver/Cache/Subscriber/ResolverCacheIdentity.php b/app/code/Magento/NewsletterGraphQl/Model/Resolver/Cache/Subscriber/ResolverCacheIdentity.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver\Cache\Subscriber;
+namespace Magento\NewsletterGraphQl\Model\Resolver\Cache\Subscriber;
 
 use Magento\GraphQlResolverCache\Model\Resolver\Result\Cache\IdentityInterface;
 
diff --git a/app/code/Magento/NewsletterGraphQl/Model/Resolver/Cache/Subscriber/TagsStrategy.php b/app/code/Magento/NewsletterGraphQl/Model/Resolver/Cache/Subscriber/TagsStrategy.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver\Cache\Subscriber;
+namespace Magento\NewsletterGraphQl\Model\Resolver\Cache\Subscriber;
 
 use Magento\Customer\Model\Customer;
 use Magento\Framework\App\Cache\Tag\StrategyInterface;
diff --git a/app/code/Magento/NewsletterGraphQl/Model/Resolver/CacheKey/FactorProvider/ParentCustomerEntityId.php b/app/code/Magento/NewsletterGraphQl/Model/Resolver/CacheKey/FactorProvider/ParentCustomerEntityId.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver\CacheKey\FactorProvider;
+namespace Magento\NewsletterGraphQl\Model\Resolver\CacheKey\FactorProvider;
 
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\GraphQl\Model\Query\ContextInterface;
diff --git a/app/code/Magento/NewsletterGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/NewsletterGraphQl/Model/Resolver/IsSubscribed.php
@@ -5,7 +5,7 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver;
+namespace Magento\NewsletterGraphQl\Model\Resolver;
 
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Framework\App\ObjectManager;
diff --git a/app/code/Magento/NewsletterGraphQl/Test/Unit/Model/Resolver/IsSubscribedTest.php b/app/code/Magento/NewsletterGraphQl/Test/Unit/Model/Resolver/IsSubscribedTest.php
@@ -6,10 +6,10 @@
 
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Test\Unit\Model\Resolver;
+namespace Magento\NewsletterGraphQl\Test\Unit\Model\Resolver;
 
 use Magento\Customer\Api\Data\CustomerInterface;
-use Magento\CustomerGraphQl\Model\Resolver\IsSubscribed;
+use Magento\NewsletterGraphQl\Model\Resolver\IsSubscribed;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
diff --git a/app/code/Magento/NewsletterGraphQl/composer.json b/app/code/Magento/NewsletterGraphQl/composer.json
@@ -10,10 +10,9 @@
         "magento/framework": "*",
         "magento/module-customer": "*",
         "magento/module-newsletter": "*",
-        "magento/module-store": "*"
-    },
-    "suggest": {
-        "magento/module-graph-ql": "*"
+        "magento/module-store": "*",
+        "magento/module-graph-ql": "*",
+        "magento/module-graph-ql-resolver-cache": "*"
     },
     "license": [
         "OSL-3.0",
diff --git a/app/code/Magento/NewsletterGraphQl/etc/di.xml b/app/code/Magento/NewsletterGraphQl/etc/di.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!--
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+-->
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\App\Cache\Tag\Strategy\Factory">
+        <arguments>
+            <argument name="customStrategies" xsi:type="array">
+                <item name="Magento\Newsletter\Model\Subscriber" xsi:type="object">Magento\NewsletterGraphQl\Model\Resolver\Cache\Subscriber\TagsStrategy</item>
+            </argument>
+        </arguments>
+    </type>
+</config>
diff --git a/app/code/Magento/NewsletterGraphQl/etc/graphql/di.xml b/app/code/Magento/NewsletterGraphQl/etc/graphql/di.xml
@@ -25,4 +25,22 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\GraphQlResolverCache\Model\Resolver\Result\ResolverIdentityClassProvider">
+        <arguments>
+            <argument name="cacheableResolverClassNameIdentityMap" xsi:type="array">
+                <item name="Magento\NewsletterGraphQl\Model\Resolver\IsSubscribed" xsi:type="string">
+                    Magento\NewsletterGraphQl\Model\Resolver\Cache\Subscriber\ResolverCacheIdentity
+                </item>
+            </argument>
+        </arguments>
+    </type>
+    <type name="Magento\GraphQlResolverCache\Model\Resolver\Result\CacheKey\Calculator\Provider">
+        <arguments>
+            <argument name="factorProviders" xsi:type="array">
+                <item name="Magento\NewsletterGraphQl\Model\Resolver\IsSubscribed" xsi:type="array">
+                    <item name="parent_customer_entity_id" xsi:type="string">Magento\NewsletterGraphQl\Model\Resolver\CacheKey\FactorProvider\ParentCustomerEntityId</item>
+                </item>
+            </argument>
+        </arguments>
+    </type>
 </config>
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/CartItemPrices.php
@@ -66,6 +66,17 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             $this->totals = $this->totalsCollector->collectQuoteTotals($cartItem->getQuote());
         }
         $currencyCode = $cartItem->getQuote()->getQuoteCurrencyCode();
+
+        /** calculate bundle product discount */
+        if ($cartItem->getProductType() == 'bundle') {
+            $discountValues = $this->getDiscountValues($cartItem, $currencyCode);
+            $discountAmount = 0;
+            foreach ((array) $discountValues as $discountValue) {
+                $discountAmount += $discountValue['amount']['value'];
+            }
+        } else {
+            $discountAmount = $cartItem->getDiscountAmount();
+        }
         return [
             'model' => $cartItem,
             'price' => [
@@ -86,7 +97,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             ],
             'total_item_discount' => [
                 'currency' => $currencyCode,
-                'value' => $cartItem->getDiscountAmount(),
+                'value' => $discountAmount,
             ],
             'discounts' => $this->getDiscountValues($cartItem, $currencyCode)
         ];
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/ProductResolver.php b/app/code/Magento/SalesGraphQl/Model/Resolver/ProductResolver.php
@@ -0,0 +1,53 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SalesGraphQl\Model\Resolver;
+
+use Magento\Catalog\Model\Product;
+use Magento\CatalogGraphQl\Model\ProductDataProvider;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+
+/**
+ * Fetches the Product data according to the GraphQL schema
+ */
+class ProductResolver implements ResolverInterface
+{
+    /**
+     * @var ProductDataProvider
+     */
+    private $productDataProvider;
+
+    /**
+     * @param ProductDataProvider $productDataProvider
+     */
+    public function __construct(ProductDataProvider $productDataProvider)
+    {
+        $this->productDataProvider = $productDataProvider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function resolve(
+        Field $field,
+        $context,
+        ResolveInfo $info,
+        array $value = null,
+        array $args = null
+    ) {
+        if (!isset($value['associatedProduct'])) {
+            throw new LocalizedException(__('Missing key "associatedProduct" in Order Item value data'));
+        }
+        /** @var Product $product */
+        $product = $value['associatedProduct'];
+
+        return $this->productDataProvider->getProductDataById((int) $product->getId());
+    }
+}
diff --git a/app/code/Magento/SalesGraphQl/composer.json b/app/code/Magento/SalesGraphQl/composer.json
@@ -11,7 +11,8 @@
         "magento/module-tax": "*",
         "magento/module-quote": "*",
         "magento/module-graph-ql": "*",
-        "magento/module-shipping": "*"
+        "magento/module-shipping": "*",
+        "magento/module-catalog-graph-ql": "*"
     },
     "license": [
         "OSL-3.0",
diff --git a/app/code/Magento/SalesGraphQl/etc/schema.graphqls b/app/code/Magento/SalesGraphQl/etc/schema.graphqls
@@ -110,6 +110,7 @@ interface OrderItemInterface @doc(description: "Order item details.") @typeResol
     quantity_invoiced: Float @doc(description: "The number of invoiced items.")
     quantity_canceled: Float @doc(description: "The number of canceled items.")
     quantity_returned: Float @doc(description: "The number of returned items.")
+    product: ProductInterface @doc(description: "The ProductInterface object, which contains details about the base product") @resolver(class: "Magento\\SalesGraphQl\\Model\\Resolver\\ProductResolver")
 }
 
 type OrderItem implements OrderItemInterface {
diff --git a/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js b/app/code/Magento/Swatches/view/base/web/js/swatch-renderer.js
@@ -385,7 +385,7 @@ define([
                 isInProductView = false;
 
             productId = this.element.parents('.product-item-details')
-                    .find('.price-box.price-final_price').attr('data-product-id');
+                .find('.price-box.price-final_price').attr('data-product-id');
 
             if (!productId) {
                 // Check individual product.
@@ -854,7 +854,7 @@ define([
          */
         _toggleCheckedAttributes: function ($this, $wrapper) {
             $wrapper.attr('aria-activedescendant', $this.attr('id'))
-                    .find('.' + this.options.classes.optionClass).attr('aria-checked', false);
+                .find('.' + this.options.classes.optionClass).attr('aria-checked', false);
             $this.attr('aria-checked', true);
         },
 
@@ -1309,7 +1309,10 @@ define([
                 }
 
                 imagesToUpdate = images.length ? this._setImageType($.extend(true, [], images)) : [];
-                isInitial = _.isEqual(imagesToUpdate, initialImages);
+                isInitial = _.isEqual(
+                    imagesToUpdate.map(({thumb, img, full, type, videoUrl}) => ({thumb, img, full, type, videoUrl})),
+                    initialImages.map(({thumb, img, full, type, videoUrl}) => ({thumb, img, full, type, videoUrl}))
+                );
 
                 if (this.options.gallerySwitchStrategy === 'prepend' && !isInitial) {
                     imagesToUpdate = imagesToUpdate.concat(initialImages);
diff --git a/composer.json b/composer.json
@@ -68,7 +68,7 @@
         "laminas/laminas-validator": "^2.23",
         "league/flysystem": "^2.4",
         "league/flysystem-aws-s3-v3": "^2.4",
-        "magento/composer": "dev-develop",
+        "magento/composer": "^1.10.0-beta1",
         "magento/composer-dependency-version-audit-plugin": "^0.1",
         "magento/magento-composer-installer": ">=0.4.0",
         "magento/zend-cache": "^1.16",
diff --git a/composer.lock b/composer.lock
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerGraphQl/Model/Resolver/CustomerTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/CustomerGraphQl/Model/Resolver/CustomerTest.php
@@ -12,7 +12,7 @@
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Test\Fixture\Customer as CustomerFixture;
 use Magento\CustomerGraphQl\Model\Resolver\Customer as CustomerResolver;
-use Magento\CustomerGraphQl\Model\Resolver\IsSubscribed;
+use Magento\NewsletterGraphQl\Model\Resolver\IsSubscribed;
 use Magento\Framework\ObjectManagerInterface;
 use Magento\Framework\Registry;
 use Magento\GraphQlResolverCache\Model\Resolver\Result\CacheKey\Calculator\ProviderInterface;
