Skip to content

Commit 35ccda3

Browse files
ameysarameysar
committed
MC-22131: Revert of MC-16333
1 parent f2eaa1d commit 35ccda3

File tree

5 files changed

+43
-153
lines changed

5 files changed

+43
-153
lines changed

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

Lines changed: 0 additions & 19 deletions
This file was deleted.

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

Lines changed: 41 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
declare(strict_types=1);
7-
86
namespace Magento\CatalogInventory\Ui\DataProvider\Product\Form\Modifier;
97

108
use Magento\Catalog\Controller\Adminhtml\Product\Initialization\StockDataFilter;
@@ -229,9 +227,48 @@ private function prepareMeta()
229227
) - 1,
230228
'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
231229
];
230+
$qty['arguments']['data']['config'] = [
231+
'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
232+
'group' => 'quantity_and_stock_status_qty',
233+
'dataType' => 'number',
234+
'formElement' => 'input',
235+
'componentType' => 'field',
236+
'visible' => '1',
237+
'require' => '0',
238+
'additionalClasses' => 'admin__field-small',
239+
'label' => __('Quantity'),
240+
'scopeLabel' => '[GLOBAL]',
241+
'dataScope' => 'qty',
242+
'validation' => [
243+
'validate-number' => true,
244+
'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
245+
],
246+
'imports' => [
247+
'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',
248+
],
249+
'sortOrder' => 10,
250+
];
251+
$advancedInventoryButton['arguments']['data']['config'] = [
252+
'displayAsLink' => true,
253+
'formElement' => 'container',
254+
'componentType' => 'container',
255+
'component' => 'Magento_Ui/js/form/components/button',
256+
'template' => 'ui/form/components/button/container',
257+
'actions' => [
258+
[
259+
'targetName' => 'product_form.product_form.advanced_inventory_modal',
260+
'actionName' => 'toggleModal',
261+
],
262+
],
263+
'title' => __('Advanced Inventory'),
264+
'provider' => false,
265+
'additionalForGroup' => true,
266+
'source' => 'product_details',
267+
'sortOrder' => 20,
268+
];
232269
$container['children'] = [
233-
'qty' => $this->getQtyMetaStructure(),
234-
'advanced_inventory_button' => $this->getAdvancedInventoryButtonMetaStructure(),
270+
'qty' => $qty,
271+
'advanced_inventory_button' => $advancedInventoryButton,
235272
];
236273

237274
$this->meta = $this->arrayManager->merge(
@@ -241,74 +278,4 @@ private function prepareMeta()
241278
);
242279
}
243280
}
244-
245-
/**
246-
* Get Qty meta structure
247-
*
248-
* @return array
249-
*/
250-
private function getQtyMetaStructure()
251-
{
252-
return [
253-
'arguments' => [
254-
'data' => [
255-
'config' => [
256-
'component' => 'Magento_CatalogInventory/js/components/qty-validator-changer',
257-
'group' => 'quantity_and_stock_status_qty',
258-
'dataType' => 'number',
259-
'formElement' => 'input',
260-
'componentType' => 'field',
261-
'visible' => '1',
262-
'require' => '0',
263-
'additionalClasses' => 'admin__field-small',
264-
'label' => __('Quantity'),
265-
'scopeLabel' => '[GLOBAL]',
266-
'dataScope' => 'qty',
267-
'validation' => [
268-
'validate-number' => true,
269-
'less-than-equals-to' => StockDataFilter::MAX_QTY_VALUE,
270-
],
271-
'imports' => [
272-
'handleChanges' => '${$.provider}:data.product.stock_data.is_qty_decimal',
273-
],
274-
'sortOrder' => 10,
275-
'disabled' => $this->locator->getProduct()->isLockedAttribute('quantity_and_stock_status'),
276-
]
277-
]
278-
]
279-
];
280-
}
281-
282-
/**
283-
* Get advances inventory button meta structure
284-
*
285-
* @return array
286-
*/
287-
private function getAdvancedInventoryButtonMetaStructure()
288-
{
289-
return [
290-
'arguments' => [
291-
'data' => [
292-
'config' => [
293-
'displayAsLink' => true,
294-
'formElement' => 'container',
295-
'componentType' => 'container',
296-
'component' => 'Magento_Ui/js/form/components/button',
297-
'template' => 'ui/form/components/button/container',
298-
'actions' => [
299-
[
300-
'targetName' => 'product_form.product_form.advanced_inventory_modal',
301-
'actionName' => 'toggleModal',
302-
],
303-
],
304-
'title' => __('Advanced Inventory'),
305-
'provider' => false,
306-
'additionalForGroup' => true,
307-
'source' => 'product_details',
308-
'sortOrder' => 20,
309-
]
310-
]
311-
]
312-
];
313-
}
314281
}

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,8 @@
7474
<link name="linkedValue">${$.provider}:data.product.stock_data.manage_stock</link>
7575
</links>
7676
<exports>
77-
<link name="disabled">${$.parentName}.manage_stock:disabled</link>
7877
<link name="checked">${$.parentName}.manage_stock:disabled</link>
7978
</exports>
80-
<imports>
81-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
82-
</imports>
8379
</settings>
8480
<formElements>
8581
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -105,7 +101,6 @@
105101
<dataScope>quantity_and_stock_status.qty</dataScope>
106102
<links>
107103
<link name="value">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:value</link>
108-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
109104
</links>
110105
<imports>
111106
<link name="handleChanges">${$.provider}:data.product.stock_data.is_qty_decimal</link>
@@ -154,12 +149,8 @@
154149
<link name="linkedValue">${$.provider}:data.product.stock_data.min_qty</link>
155150
</links>
156151
<exports>
157-
<link name="disabled">${$.parentName}.min_qty:disabled</link>
158152
<link name="checked">${$.parentName}.min_qty:disabled</link>
159153
</exports>
160-
<imports>
161-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
162-
</imports>
163154
</settings>
164155
<formElements>
165156
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -220,13 +211,6 @@
220211
<class name="admin__field-no-label">true</class>
221212
</additionalClasses>
222213
<dataScope>use_config_min_sale_qty</dataScope>
223-
<exports>
224-
<link name="disabled">${$.parentName}.min_sale_qty:disabled</link>
225-
<link name="checked">${$.parentName}.min_sale_qty:disabled</link>
226-
</exports>
227-
<imports>
228-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
229-
</imports>
230214
</settings>
231215
<formElements>
232216
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -325,12 +309,8 @@
325309
<link name="linkedValue">${$.provider}:data.product.stock_data.max_sale_qty</link>
326310
</links>
327311
<exports>
328-
<link name="disabled">${$.parentName}.max_sale_qty:disabled</link>
329312
<link name="checked">${$.parentName}.max_sale_qty:disabled</link>
330313
</exports>
331-
<imports>
332-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
333-
</imports>
334314
</settings>
335315
<formElements>
336316
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -358,7 +338,6 @@
358338
<dataScope>stock_data.is_qty_decimal</dataScope>
359339
<imports>
360340
<link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>
361-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
362341
</imports>
363342
</settings>
364343
<formElements>
@@ -381,7 +360,6 @@
381360
<dataScope>stock_data.is_decimal_divided</dataScope>
382361
<imports>
383362
<link name="visible">${$.provider}:data.product.stock_data.manage_stock</link>
384-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
385363
</imports>
386364
</settings>
387365
<formElements>
@@ -441,12 +419,8 @@
441419
<link name="linkedValue">${$.provider}:data.product.stock_data.backorders</link>
442420
</links>
443421
<exports>
444-
<link name="disabled">${$.parentName}.backorders:disabled</link>
445422
<link name="checked">${$.parentName}.backorders:disabled</link>
446423
</exports>
447-
<imports>
448-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
449-
</imports>
450424
</settings>
451425
<formElements>
452426
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -502,12 +476,8 @@
502476
<link name="linkedValue">${$.provider}:data.product.stock_data.notify_stock_qty</link>
503477
</links>
504478
<exports>
505-
<link name="disabled">${$.parentName}.notify_stock_qty:disabled</link>
506479
<link name="checked">${$.parentName}.notify_stock_qty:disabled</link>
507480
</exports>
508-
<imports>
509-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
510-
</imports>
511481
</settings>
512482
<formElements>
513483
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -565,12 +535,8 @@
565535
<link name="linkedValue">${$.provider}:data.product.stock_data.enable_qty_increments</link>
566536
</links>
567537
<exports>
568-
<link name="disabled">${$.parentName}.enable_qty_increments:disabled</link>
569538
<link name="checked">${$.parentName}.enable_qty_increments:disabled</link>
570539
</exports>
571-
<imports>
572-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
573-
</imports>
574540
</settings>
575541
<formElements>
576542
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -630,12 +596,8 @@
630596
<link name="linkedValue">${$.provider}:data.product.stock_data.qty_increments</link>
631597
</links>
632598
<exports>
633-
<link name="disabled">${$.parentName}.qty_increments:disabled</link>
634599
<link name="checked">${$.parentName}.qty_increments:disabled</link>
635600
</exports>
636-
<imports>
637-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
638-
</imports>
639601
</settings>
640602
<formElements>
641603
<checkbox class="Magento\CatalogInventory\Ui\Component\Product\Form\Element\UseConfigSettings">
@@ -672,9 +634,6 @@
672634
<scopeLabel>[GLOBAL]</scopeLabel>
673635
<label translate="true">Stock Status</label>
674636
<dataScope>is_in_stock</dataScope>
675-
<imports>
676-
<link name="disabled">ns = ${ $.ns }, index = qty, group = quantity_and_stock_status_qty:disabled</link>
677-
</imports>
678637
</settings>
679638
<formElements>
680639
<select>

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

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;
99

1010
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
11-
use Magento\Catalog\Model\Locator\LocatorInterface;
1211

1312
/**
1413
* Data provider for quantity in the Configurable products
@@ -18,21 +17,6 @@ class ConfigurableQty extends AbstractModifier
1817
const CODE_QUANTITY = 'qty';
1918
const CODE_QTY_CONTAINER = 'quantity_and_stock_status_qty';
2019

21-
/**
22-
* @var LocatorInterface
23-
*/
24-
private $locator;
25-
26-
/**
27-
* ConfigurableQty constructor
28-
*
29-
* @param LocatorInterface $locator
30-
*/
31-
public function __construct(LocatorInterface $locator)
32-
{
33-
$this->locator = $locator;
34-
}
35-
3620
/**
3721
* @inheritdoc
3822
*/
@@ -48,8 +32,7 @@ public function modifyMeta(array $meta)
4832
{
4933
if ($groupCode = $this->getGroupCodeByField($meta, self::CODE_QTY_CONTAINER)) {
5034
$parentChildren = &$meta[$groupCode]['children'];
51-
$isConfigurable = $this->locator->getProduct()->getTypeId() === 'configurable';
52-
if (!empty($parentChildren[self::CODE_QTY_CONTAINER]) && $isConfigurable) {
35+
if (!empty($parentChildren[self::CODE_QTY_CONTAINER])) {
5336
$parentChildren[self::CODE_QTY_CONTAINER] = array_replace_recursive(
5437
$parentChildren[self::CODE_QTY_CONTAINER],
5538
[

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
</category_ids>
3232
<quantity_and_stock_status composite="1">
3333
<qty>
34-
<selector>fieldset[data-index="quantity_and_stock_status_qty"] [name="product[quantity_and_stock_status][qty]"]</selector>
34+
<selector>fieldset[data-index="container_quantity_and_stock_status_qty"] [name="product[quantity_and_stock_status][qty]"]</selector>
3535
</qty>
3636
<is_in_stock>
3737
<selector>[data-index="quantity_and_stock_status"] [name="product[quantity_and_stock_status][is_in_stock]"]</selector>

0 commit comments

Comments
 (0)