Merge remote-tracking branch 'github-magento/MC-16333' into EPAM-PR-77

Author: nikshostko

app/code/Magento/CatalogInventory/Test/Mftf/ActionGroup/AdminAssertDisabledQtyActionGroup.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+              xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="AdminAssertDisabledQtyActionGroup">
+        <annotations>
+            <description>Goes to the 'Quantity' field and assert disabled attribute.</description>
+        </annotations>
+
+        <seeElement selector="{{AdminProductFormSection.productQuantity}}" stepKey="assertProductQty"/>
+        <assertElementContainsAttribute selector="{{AdminProductFormSection.productQuantity}}" attribute="disabled" expectedValue="true" stepKey="checkIfQtyIsDisabled" />
+    </actionGroup>
+</actionGroups>

app/code/Magento/CatalogInventory/Ui/DataProvider/Product/Form/Modifier/AdvancedInventory.php

@@ -1,11 +1,10 @@
 <?php
-
-declare(strict_types=1);
-
 /**
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\CatalogInventory\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
@@ -238,7 +237,7 @@ private function prepareMeta()
             $this->meta = $this->arrayManager->merge(
                 $fieldsetPath . '/children',
                 $this->meta,
-                ['container_quantity_and_stock_status_qty' => $container]
+                ['quantity_and_stock_status_qty' => $container]
             );
         }
     }

app/code/Magento/ConfigurableProduct/Ui/DataProvider/Product/Form/Modifier/ConfigurableQty.php

@@ -3,9 +3,12 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
 
 use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
+use Magento\Catalog\Model\Locator\LocatorInterface;
 
 /**
  * Data provider for quantity in the Configurable products
@@ -16,21 +19,37 @@ class ConfigurableQty extends AbstractModifier
     const CODE_QTY_CONTAINER = 'quantity_and_stock_status_qty';
 
     /**
-     * {@inheritdoc}
+     * @var LocatorInterface
+     */
+    private $locator;
+
+    /**
+     * ConfigurableQty constructor
+     *
+     * @param LocatorInterface $locator
+     */
+    public function __construct(LocatorInterface $locator)
+    {
+        $this->locator = $locator;
+    }
+
+    /**
+     * @inheritdoc
      */
     public function modifyData(array $data)
     {
         return $data;
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function modifyMeta(array $meta)
     {
         if ($groupCode = $this->getGroupCodeByField($meta, self::CODE_QTY_CONTAINER)) {
             $parentChildren = &$meta[$groupCode]['children'];
-            if (!empty($parentChildren[self::CODE_QTY_CONTAINER])) {
+            $isConfigurable = $this->locator->getProduct()->getTypeId() === 'configurable';
+            if (!empty($parentChildren[self::CODE_QTY_CONTAINER]) && $isConfigurable) {
                 $parentChildren[self::CODE_QTY_CONTAINER] = array_replace_recursive(
                     $parentChildren[self::CODE_QTY_CONTAINER],
                     [

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/ProductForm.xml

@@ -31,7 +31,7 @@
             </category_ids>
             <quantity_and_stock_status composite="1">
                 <qty>
-                    <selector>fieldset[data-index="container_quantity_and_stock_status_qty"] [name="product[quantity_and_stock_status][qty]"]</selector>
+                    <selector>fieldset[data-index="quantity_and_stock_status_qty"] [name="product[quantity_and_stock_status][qty]"]</selector>
                 </qty>
                 <is_in_stock>
                     <selector>[data-index="quantity_and_stock_status"] [name="product[quantity_and_stock_status][is_in_stock]"]</selector>