Skip to content

Commit 88d7d11

Browse files
SeruyVSeruyV
committed
MC-17149: UI components configuration incorrect (overlapping text labels)
1 parent 0053757 commit 88d7d11

File tree

13 files changed

+87
-69
lines changed

13 files changed

+87
-69
lines changed

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/AdvancedPricing.php

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -149,6 +149,7 @@ public function modifyMeta(array $meta)
149149

150150
$this->specialPriceDataToInline();
151151
$this->customizeTierPrice();
152+
$this->customizePrice();
152153

153154
if (isset($this->meta['advanced-pricing'])) {
154155
$this->addAdvancedPriceLink();
@@ -197,6 +198,29 @@ protected function preparePriceFields($fieldCode)
197198
return $this;
198199
}
199200

201+
/**
202+
* Customize price field.
203+
*
204+
* @return $this
205+
*/
206+
private function customizePrice()
207+
{
208+
$pathFrom = $this->arrayManager->findPath('price', $this->meta, null, 'children');
209+
210+
if ($pathFrom) {
211+
$this->meta = $this->arrayManager->merge(
212+
$this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
213+
$this->meta,
214+
[
215+
'label' => false,
216+
'required' => false,
217+
]
218+
);
219+
}
220+
221+
return $this;
222+
}
223+
200224
/**
201225
* Customize tier price field
202226
*
@@ -573,21 +597,21 @@ private function specialPriceDataToInline()
573597
$this->arrayManager->slicePath($pathFrom, 0, -2) . '/arguments/data/config',
574598
$this->meta,
575599
[
576-
'label' => __('Special Price From'),
600+
'label' => false,
601+
'required' => false,
577602
'additionalClasses' => 'admin__control-grouped-date',
578603
'breakLine' => false,
579604
'component' => 'Magento_Ui/js/form/components/group',
580-
'scopeLabel' =>
581-
$this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
582605
]
583606
);
584607
$this->meta = $this->arrayManager->merge(
585608
$pathFrom . '/arguments/data/config',
586609
$this->meta,
587610
[
588611
'label' => __('Special Price From'),
589-
'scopeLabel' => null,
590-
'additionalClasses' => 'admin__field-date'
612+
'scopeLabel' =>
613+
$this->arrayManager->get($pathFrom . '/arguments/data/config/scopeLabel', $this->meta),
614+
'additionalClasses' => 'admin__field-date',
591615
]
592616
);
593617
$this->meta = $this->arrayManager->merge(

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Categories.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,13 +243,13 @@ protected function customizeCategoriesField(array $meta)
243243
'arguments' => [
244244
'data' => [
245245
'config' => [
246-
'label' => __('Categories'),
246+
'label' => false,
247+
'required' => false,
247248
'dataScope' => '',
248249
'breakLine' => false,
249250
'formElement' => 'container',
250251
'componentType' => 'container',
251252
'component' => 'Magento_Ui/js/form/components/group',
252-
'scopeLabel' => __('[GLOBAL]'),
253253
'disabled' => $this->locator->getProduct()->isLockedAttribute($fieldCode),
254254
],
255255
],

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/Eav.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -858,7 +858,9 @@ public function setupAttributeContainerMeta(ProductAttributeInterface $attribute
858858
'arguments/data/config',
859859
$containerMeta,
860860
[
861-
'component' => 'Magento_Ui/js/form/components/group'
861+
'component' => 'Magento_Ui/js/form/components/group',
862+
'label' => false,
863+
'required' => false,
862864
]
863865
);
864866
}

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/General.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,6 +239,8 @@ protected function customizeWeightField(array $meta)
239239
$containerPath . static::META_CONFIG_PATH,
240240
$meta,
241241
[
242+
'label' => false,
243+
'required' => false,
242244
'component' => 'Magento_Ui/js/form/components/group',
243245
]
244246
);
@@ -314,7 +316,8 @@ protected function customizeNewDateRangeField(array $meta)
314316
$fromContainerPath . self::META_CONFIG_PATH,
315317
$meta,
316318
[
317-
'label' => __('Set Product as New From'),
319+
'label' => false,
320+
'required' => false,
318321
'additionalClasses' => 'admin__control-grouped-date',
319322
'breakLine' => false,
320323
'component' => 'Magento_Ui/js/form/components/group',

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/ScheduleDesignUpdate.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,8 @@ public function __construct(ArrayManager $arrayManager)
3737
}
3838

3939
/**
40-
* {@inheritdoc}
40+
* @inheritdoc
41+
*
4142
* @since 101.0.0
4243
*/
4344
public function modifyMeta(array $meta)
@@ -47,7 +48,8 @@ public function modifyMeta(array $meta)
4748
}
4849

4950
/**
50-
* {@inheritdoc}
51+
* @inheritdoc
52+
*
5153
* @since 101.0.0
5254
*/
5355
public function modifyData(array $data)
@@ -96,7 +98,8 @@ protected function customizeDateRangeField(array $meta)
9698
$fromContainerPath . self::META_CONFIG_PATH,
9799
$meta,
98100
[
99-
'label' => __('Schedule Update From'),
101+
'label' => false,
102+
'required' => false,
100103
'additionalClasses' => 'admin__control-grouped-date',
101104
'breakLine' => false,
102105
'component' => 'Magento_Ui/js/form/components/group',

‎app/code/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/TierPrice.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ private function getUpdatedTierPriceStructure(array $priceMeta)
115115
'dataType' => Price::NAME,
116116
'component' => 'Magento_Ui/js/form/components/group',
117117
'label' => __('Price'),
118-
'enableLabel' => true,
118+
'showLabel' => false,
119119
'dataScope' => '',
120120
'additionalClasses' => 'control-grouped',
121121
'sortOrder' => isset($priceMeta['arguments']['data']['config']['sortOrder'])

‎app/code/Magento/Catalog/view/adminhtml/ui_component/category_form.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -527,10 +527,7 @@
527527
<item name="type" xsi:type="string">group</item>
528528
<item name="config" xsi:type="array">
529529
<item name="additionalClasses" xsi:type="string">admin__control-grouped-date</item>
530-
<item name="label" xsi:type="string" translate="true">Schedule Update From</item>
531-
<item name="required" xsi:type="boolean">false</item>
532530
<item name="breakLine" xsi:type="boolean">false</item>
533-
<item name="scopeLabel" xsi:type="string">[STORE VIEW]</item>
534531
</item>
535532
</argument>
536533
<field name="custom_design_from" sortOrder="230" formElement="date">
@@ -540,6 +537,7 @@
540537
</additionalClasses>
541538
<dataType>string</dataType>
542539
<label translate="true">Schedule Update From</label>
540+
<scopeLabel>[STORE VIEW]</scopeLabel>
543541
</settings>
544542
</field>
545543
<field name="custom_design_to" sortOrder="240" formElement="date">

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ public function __construct(
8585
}
8686

8787
/**
88-
* {@inheritdoc}
88+
* @inheritdoc
8989
*/
9090
public function modifyData(array $data)
9191
{
@@ -163,7 +163,7 @@ private function getData(StockItemInterface $stockItem)
163163
}
164164

165165
/**
166-
* {@inheritdoc}
166+
* @inheritdoc
167167
*/
168168
public function modifyMeta(array $meta)
169169
{
@@ -175,6 +175,8 @@ public function modifyMeta(array $meta)
175175
}
176176

177177
/**
178+
* Modify UI Quantity and Stock status attribute meta.
179+
*
178180
* @return void
179181
*/
180182
private function prepareMeta()
@@ -183,10 +185,6 @@ private function prepareMeta()
183185
$pathField = $this->arrayManager->findPath($fieldCode, $this->meta, null, 'children');
184186

185187
if ($pathField) {
186-
$labelField = $this->arrayManager->get(
187-
$this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/label',
188-
$this->meta
189-
);
190188
$fieldsetPath = $this->arrayManager->slicePath($pathField, 0, -4);
191189

192190
$this->meta = $this->arrayManager->merge(
@@ -214,10 +212,9 @@ private function prepareMeta()
214212
'formElement' => 'container',
215213
'componentType' => 'container',
216214
'component' => "Magento_Ui/js/form/components/group",
217-
'label' => $labelField,
215+
'label' => false,
218216
'breakLine' => false,
219217
'dataScope' => $fieldCode,
220-
'scopeLabel' => '[GLOBAL]',
221218
'source' => 'product_details',
222219
'sortOrder' => (int) $this->arrayManager->get(
223220
$this->arrayManager->slicePath($pathField, 0, -2) . '/arguments/data/config/sortOrder',

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

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,7 @@
3535
<argument name="data" xsi:type="array">
3636
<item name="config" xsi:type="array">
3737
<item name="formElement" xsi:type="string">container</item>
38-
<item name="label" xsi:type="string" translate="true">Manage Stock</item>
3938
<item name="dataScope" xsi:type="string">stock_data</item>
40-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
4139
</item>
4240
</argument>
4341
<field name="manage_stock" formElement="select">
@@ -112,9 +110,7 @@
112110
<argument name="data" xsi:type="array">
113111
<item name="config" xsi:type="array">
114112
<item name="formElement" xsi:type="string">container</item>
115-
<item name="label" xsi:type="string" translate="true">Out-of-Stock Threshold</item>
116113
<item name="dataScope" xsi:type="string">stock_data</item>
117-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
118114
<item name="imports" xsi:type="array">
119115
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
120116
</item>
@@ -274,9 +270,7 @@
274270
<argument name="data" xsi:type="array">
275271
<item name="config" xsi:type="array">
276272
<item name="formElement" xsi:type="string">container</item>
277-
<item name="label" xsi:type="string" translate="true">Maximum Qty Allowed in Shopping Cart</item>
278273
<item name="dataScope" xsi:type="string">stock_data</item>
279-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
280274
</item>
281275
</argument>
282276
<field name="max_sale_qty" formElement="input">
@@ -373,9 +367,7 @@
373367
<argument name="data" xsi:type="array">
374368
<item name="config" xsi:type="array">
375369
<item name="formElement" xsi:type="string">container</item>
376-
<item name="label" xsi:type="string" translate="true">Backorders</item>
377370
<item name="dataScope" xsi:type="string">stock_data</item>
378-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
379371
<item name="imports" xsi:type="array">
380372
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
381373
</item>
@@ -438,9 +430,7 @@
438430
<argument name="data" xsi:type="array">
439431
<item name="config" xsi:type="array">
440432
<item name="formElement" xsi:type="string">container</item>
441-
<item name="label" xsi:type="string" translate="true">Notify for Quantity Below</item>
442433
<item name="dataScope" xsi:type="string">stock_data</item>
443-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
444434
<item name="imports" xsi:type="array">
445435
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
446436
</item>
@@ -495,9 +485,7 @@
495485
<argument name="data" xsi:type="array">
496486
<item name="config" xsi:type="array">
497487
<item name="formElement" xsi:type="string">container</item>
498-
<item name="label" xsi:type="string" translate="true">Enable Qty Increments</item>
499488
<item name="dataScope" xsi:type="string">stock_data</item>
500-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
501489
</item>
502490
</argument>
503491
<field name="enable_qty_increments" formElement="select">
@@ -554,9 +542,7 @@
554542
<argument name="data" xsi:type="array">
555543
<item name="config" xsi:type="array">
556544
<item name="formElement" xsi:type="string">container</item>
557-
<item name="label" xsi:type="string" translate="true">Qty Increments</item>
558545
<item name="dataScope" xsi:type="string">stock_data</item>
559-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
560546
<item name="imports" xsi:type="array">
561547
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.enable_qty_increments</item>
562548
</item>
@@ -615,9 +601,7 @@
615601
<argument name="data" xsi:type="array">
616602
<item name="config" xsi:type="array">
617603
<item name="formElement" xsi:type="string">container</item>
618-
<item name="label" xsi:type="string" translate="true">Stock Status</item>
619604
<item name="dataScope" xsi:type="string">quantity_and_stock_status</item>
620-
<item name="scopeLabel" xsi:type="string">[GLOBAL]</item>
621605
<item name="imports" xsi:type="array">
622606
<item name="visible" xsi:type="string">${$.provider}:data.product.stock_data.manage_stock</item>
623607
</item>

‎app/code/Magento/CatalogUrlRewrite/Ui/DataProvider/Product/Form/Modifier/ProductUrlRewrite.php

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function __construct(
5353
}
5454

5555
/**
56-
* {@inheritdoc}
56+
* @inheritdoc
5757
*/
5858
public function modifyMeta(array $meta)
5959
{
@@ -65,7 +65,7 @@ public function modifyMeta(array $meta)
6565
}
6666

6767
/**
68-
* {@inheritdoc}
68+
* @inheritdoc
6969
*/
7070
public function modifyData(array $data)
7171
{
@@ -95,16 +95,21 @@ protected function addUrlRewriteCheckbox(array $meta)
9595
ScopeInterface::SCOPE_STORE,
9696
$this->locator->getProduct()->getStoreId()
9797
);
98-
99-
$meta = $this->arrayManager->merge($containerPath, $meta, [
100-
'arguments' => [
101-
'data' => [
102-
'config' => [
103-
'component' => 'Magento_Ui/js/form/components/group',
98+
$meta = $this->arrayManager->merge(
99+
$containerPath,
100+
$meta,
101+
[
102+
'arguments' => [
103+
'data' => [
104+
'config' => [
105+
'component' => 'Magento_Ui/js/form/components/group',
106+
'label' => false,
107+
'required' => false,
108+
],
104109
],
105110
],
106-
],
107-
]);
111+
]
112+
);
108113

109114
$checkbox['arguments']['data']['config'] = [
110115
'componentType' => Field::NAME,

0 commit comments

Comments
 (0)