Skip to content

Commit

Permalink
ENGCOM-3963: Fix for #20527 [Admin] Configurable product variations t…
Browse files Browse the repository at this point in the history
…able cell labels wrong position #20528

 - Merge Pull Request #20528 from vasilii-b/magento2:2.3-configurable-product-variations-data-table-labels-alignment
 - Merged commits:
   1. af11e87
   2. ed2a80c
   3. d9c962f
  • Loading branch information
magento-engcom-team committed Mar 5, 2019
2 parents 7d0efc5 + d9c962f commit cf04a0b
Showing 1 changed file with 11 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@
*/
namespace Magento\ConfigurableProduct\Ui\DataProvider\Product\Form\Modifier;

use Magento\Catalog\Model\Locator\LocatorInterface;
use Magento\Catalog\Model\Product\Attribute\Backend\Sku;
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\AbstractModifier;
use Magento\Framework\UrlInterface;
use Magento\Ui\Component\Container;
use Magento\Ui\Component\Form;
use Magento\Ui\Component\DynamicRows;
use Magento\Ui\Component\Form;
use Magento\Ui\Component\Modal;
use Magento\Framework\UrlInterface;
use Magento\Catalog\Model\Locator\LocatorInterface;

/**
* Data provider for Configurable panel
Expand Down Expand Up @@ -90,15 +90,15 @@ public function __construct(
}

/**
* {@inheritdoc}
* @inheritdoc
*/
public function modifyData(array $data)
{
return $data;
}

/**
* {@inheritdoc}
* @inheritdoc
* @SuppressWarnings(PHPMD.ExcessiveMethodLength)
*/
public function modifyMeta(array $meta)
Expand Down Expand Up @@ -197,7 +197,7 @@ public function modifyMeta(array $meta)
'autoRender' => false,
'componentType' => 'insertListing',
'component' => 'Magento_ConfigurableProduct/js'
.'/components/associated-product-insert-listing',
. '/components/associated-product-insert-listing',
'dataScope' => $this->associatedListingPrefix
. static::ASSOCIATED_PRODUCT_LISTING,
'externalProvider' => $this->associatedListingPrefix
Expand Down Expand Up @@ -328,14 +328,12 @@ protected function getButtonSet()
'component' => 'Magento_Ui/js/form/components/button',
'actions' => [
[
'targetName' =>
$this->dataScopeName . '.configurableModal',
'targetName' => $this->dataScopeName . '.configurableModal',
'actionName' => 'trigger',
'params' => ['active', true],
],
[
'targetName' =>
$this->dataScopeName . '.configurableModal',
'targetName' => $this->dataScopeName . '.configurableModal',
'actionName' => 'openModal',
],
],
Expand Down Expand Up @@ -471,8 +469,7 @@ protected function getRows()
'sku',
__('SKU'),
[
'validation' =>
[
'validation' => [
'required-entry' => true,
'max_text_length' => Sku::SKU_MAX_LENGTH,
],
Expand Down Expand Up @@ -577,6 +574,7 @@ protected function getColumn(
'dataType' => Form\Element\DataType\Text::NAME,
'dataScope' => $name,
'visibleIfCanEdit' => false,
'labelVisible' => false,
'imports' => [
'visible' => '!${$.provider}:${$.parentScope}.canEdit'
],
Expand All @@ -595,6 +593,7 @@ protected function getColumn(
'component' => 'Magento_Ui/js/form/components/group',
'label' => $label,
'dataScope' => '',
'showLabel' => false
];
$container['children'] = [
$name . '_edit' => $fieldEdit,
Expand Down

0 comments on commit cf04a0b

Please sign in to comment.