').text(jQuery.mage.__('Sending attribute values as package.')));
+ );
+ jQuery('
')
+ .attr({
+ type: 'hidden',
+ name: 'serialized_options'
+ })
+ .val(JSON.stringify(optionsValues))
+ .prependTo(editForm);
+ }
+ tableBody = optionContainer.detach();
+ });
+ editForm.on('afterValidate.error highlight.validate', function () {
+ if (optionPanel.hasClass(activePanelClass)) {
+ optionPanel.find('table').append(tableBody);
+ jQuery('input[name="serialized_options"]').remove();
+ }
});
window.attributeOption = attributeOption;
window.optionDefaultInputType = attributeOption.getOptionInputType();
diff -Nuar a/vendor/magento/module-swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php b/vendor/magento/module-swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
--- a/vendor/magento/module-swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
+++ b/vendor/magento/module-swatches/Controller/Adminhtml/Product/Attribute/Plugin/Save.php
@@ -16,6 +16,8 @@
class Save
{
/**
+ * Performs the conversion of the frontend input value.
+ *
* @param Attribute\Save $subject
* @param RequestInterface $request
* @return array
@@ -26,15 +28,6 @@ public function beforeDispatch(Attribute\Save $subject, RequestInterface $reques
$data = $request->getPostValue();
if (isset($data['frontend_input'])) {
- //Data is serialized to overcome issues caused by max_input_vars value if it's modification is unavailable.
- //See subject controller code and comments for more info.
- if (isset($data['serialized_swatch_values'])
- && in_array($data['frontend_input'], ['swatch_visual', 'swatch_text'])
- ) {
- $data['serialized_options'] = $data['serialized_swatch_values'];
- unset($data['serialized_swatch_values']);
- }
-
switch ($data['frontend_input']) {
case 'swatch_visual':
$data[Swatch::SWATCH_INPUT_TYPE_KEY] = Swatch::SWATCH_INPUT_TYPE_VISUAL;
diff -Nuar a/vendor/magento/module-swatches/view/adminhtml/web/js/product-attributes.js b/vendor/magento/module-swatches/view/adminhtml/web/js/product-attributes.js
--- a/vendor/magento/module-swatches/view/adminhtml/web/js/product-attributes.js
+++ b/vendor/magento/module-swatches/view/adminhtml/web/js/product-attributes.js
@@ -16,7 +16,8 @@ define([
'use strict';
return function (optionConfig) {
- var swatchProductAttributes = {
+ var activePanelClass = 'selected-type-options',
+ swatchProductAttributes = {
frontendInput: $('#frontend_input'),
isFilterable: $('#is_filterable'),
isFilterableInSearch: $('#is_filterable_in_search'),
@@ -337,6 +338,7 @@ define([
*/
_showPanel: function (el) {
el.closest('.fieldset').show();
+ el.addClass(activePanelClass);
this._render(el.attr('id'));
},
@@ -346,6 +348,7 @@ define([
*/
_hidePanel: function (el) {
el.closest('.fieldset').hide();
+ el.removeClass(activePanelClass);
},
/**
@@ -413,7 +416,11 @@ define([
};
$(function () {
- var editForm = $('#edit_form');
+ var editForm = $('#edit_form'),
+ swatchVisualPanel = $('#swatch-visual-options-panel'),
+ swatchTextPanel = $('#swatch-text-options-panel'),
+ tableBody = $(),
+ activePanel = $();
$('#frontend_input').bind('change', function () {
swatchProductAttributes.bindAttributeInputType();
@@ -429,30 +436,35 @@ define([
.collapsable()
.collapse('hide');
- editForm.on('submit', function () {
- var activePanel,
- swatchValues = [],
- swatchVisualPanel = $('#swatch-visual-options-panel'),
- swatchTextPanel = $('#swatch-text-options-panel');
+ editForm.on('beforeSubmit', function () {
+ var optionContainer, optionsValues;
- activePanel = swatchTextPanel.is(':visible') ? swatchTextPanel : swatchVisualPanel;
+ activePanel = swatchTextPanel.hasClass(activePanelClass) ? swatchTextPanel : swatchVisualPanel;
+ optionContainer = activePanel.find('table tbody');
- activePanel.find('table input')
- .each(function () {
- swatchValues.push(this.name + '=' + $(this).val());
- });
+ if (activePanel.hasClass(activePanelClass)) {
+ optionsValues = $.map(
+ optionContainer.find('tr'),
+ function (row) {
+ return $(row).find('input, select, textarea').serialize();
+ }
+ );
+ $('
')
+ .attr({
+ type: 'hidden',
+ name: 'serialized_options'
+ })
+ .val(JSON.stringify(optionsValues))
+ .prependTo(editForm);
+ }
- $('
').attr({
- type: 'hidden',
- name: 'serialized_swatch_values'
- })
- .val(JSON.stringify(swatchValues))
- .prependTo(editForm);
-
- [swatchVisualPanel, swatchTextPanel].forEach(function (el) {
- $(el).find('table')
- .replaceWith($('
').text($.mage.__('Sending swatch values as package.')));
- });
+ tableBody = optionContainer.detach();
+ });
+ editForm.on('afterValidate.error highlight.validate', function () {
+ if (activePanel.hasClass(activePanelClass)) {
+ activePanel.find('table').append(tableBody);
+ $('input[name="serialized_options"]').remove();
+ }
});
});
diff -Nuar a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
--- a/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Catalog/Test/Handler/CatalogProductAttribute/Curl.php
@@ -91,15 +91,18 @@ public function persist(FixtureInterface $fixture = null)
$data['frontend_label'] = [0 => $data['frontend_label']];
if (isset($data['options'])) {
+ $optionsData = [];
foreach ($data['options'] as $key => $values) {
+ $optionRowData = [];
$index = 'option_' . $key;
if ($values['is_default'] == 'Yes') {
- $data['default'][] = $index;
+ $optionRowData['default'][] = $index;
}
- $data['option']['value'][$index] = [$values['admin'], $values['view']];
- $data['option']['order'][$index] = $key;
+ $optionRowData['option']['value'][$index] = [$values['admin'], $values['view']];
+ $optionRowData['option']['order'][$index] = $key;
+ $optionsData[] = $optionRowData;
}
- unset($data['options']);
+ $data['options'] = $optionsData;
}
$data = $this->changeStructureOfTheData($data);
@@ -134,11 +137,39 @@ public function persist(FixtureInterface $fixture = null)
}
/**
+ * Additional data handling.
+ *
* @param array $data
* @return array
*/
- protected function changeStructureOfTheData(array $data)
+ protected function changeStructureOfTheData(array $data): array
{
+ if (!isset($data['options'])) {
+ return $data;
+ }
+
+ $serializedOptions = $this->getSerializeOptions($data['options']);
+ if ($serializedOptions) {
+ $data['serialized_options'] = $serializedOptions;
+ unset($data['options']);
+ }
+
return $data;
}
+
+ /**
+ * Provides serialized product attribute options.
+ *
+ * @param array $data
+ * @return string
+ */
+ protected function getSerializeOptions(array $data): string
+ {
+ $options = [];
+ foreach ($data as $optionRowData) {
+ $options[] = http_build_query($optionRowData);
+ }
+
+ return json_encode($options);
+ }
}
diff -Nuar a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
--- a/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
+++ b/dev/tests/functional/tests/app/Magento/Swatches/Test/Handler/SwatchProductAttribute/Curl.php
@@ -29,21 +29,32 @@ public function __construct(DataInterface $configuration, EventManagerInterface
];
}
+ /**
+ * @inheritdoc
+ */
+ protected function changeStructureOfTheData(array $data): array
+ {
+ return parent::changeStructureOfTheData($data);
+ }
+
/**
* Re-map options from default options structure to swatches structure,
* as swatches was initially created with name convention differ from other attributes.
*
- * @param array $data
- * @return array
+ * @inheritdoc
*/
- protected function changeStructureOfTheData(array $data)
+ protected function getSerializeOptions(array $data): string
{
- $data = parent::changeStructureOfTheData($data);
- $data['optiontext'] = $data['option'];
- $data['swatchtext'] = [
- 'value' => $data['option']['value']
- ];
- unset($data['option']);
- return $data;
+ $options = [];
+ foreach ($data as $optionRowData) {
+ $optionRowData['optiontext'] = $optionRowData['option'];
+ $optionRowData['swatchtext'] = [
+ 'value' => $optionRowData['option']['value']
+ ];
+ unset($optionRowData['option']);
+ $options[] = http_build_query($optionRowData);
+ }
+
+ return json_encode($options);
}
}
diff -Nuar a/vendor/magento/framework/Serialize/Serializer/FormData.php b/vendor/magento/framework/Serialize/Serializer/FormData.php
--- /dev/null
+++ b/vendor/magento/framework/Serialize/Serializer/FormData.php
@@ -0,0 +1,55 @@
+serializer = $serializer;
+ }
+
+ /**
+ * Provides form data from the serialized data.
+ *
+ * @param string $serializedData
+ * @return array
+ * @throws \InvalidArgumentException
+ */
+ public function unserialize(string $serializedData): array
+ {
+ $encodedFields = $this->serializer->unserialize($serializedData);
+
+ if (!is_array($encodedFields)) {
+ throw new \InvalidArgumentException('Unable to unserialize value.');
+ }
+
+ $formData = [];
+ foreach ($encodedFields as $item) {
+ $decodedFieldData = [];
+ parse_str($item, $decodedFieldData);
+ $formData = array_replace_recursive($formData, $decodedFieldData);
+ }
+
+ return $formData;
+ }
+}
diff -Nuar a/vendor/magento/framework/Serialize/Test/Unit/Serializer/FormDataTest.php b/vendor/magento/framework/Serialize/Test/Unit/Serializer/FormDataTest.php
--- /dev/null
+++ b/vendor/magento/framework/Serialize/Test/Unit/Serializer/FormDataTest.php
@@ -0,0 +1,106 @@
+jsonSerializerMock = $this->createMock(Json::class);
+ $this->formDataSerializer = new FormData($this->jsonSerializerMock);
+ }
+
+ /**
+ * @param string $serializedData
+ * @param array $encodedFields
+ * @param array $expectedFormData
+ * @return void
+ * @dataProvider unserializeDataProvider
+ */
+ public function testUnserialize(string $serializedData, array $encodedFields, array $expectedFormData)
+ {
+ $this->jsonSerializerMock->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedData)
+ ->willReturn($encodedFields);
+
+ $this->assertEquals($expectedFormData, $this->formDataSerializer->unserialize($serializedData));
+ }
+
+ /**
+ * @return array
+ */
+ public function unserializeDataProvider(): array
+ {
+ return [
+ [
+ 'serializedData' =>
+ '["option[order][option_0]=1","option[value][option_0]=1","option[delete][option_0]="]',
+ 'encodedFields' => [
+ 'option[order][option_0]=1',
+ 'option[value][option_0]=1',
+ 'option[delete][option_0]=',
+ ],
+ 'expectedFormData' => [
+ 'option' => [
+ 'order' => [
+ 'option_0' => '1',
+ ],
+ 'value' => [
+ 'option_0' => '1',
+ ],
+ 'delete' => [
+ 'option_0' => '',
+ ],
+ ],
+ ],
+ ],
+ [
+ 'serializedData' => '[]',
+ 'encodedFields' => [],
+ 'expectedFormData' => [],
+ ],
+ ];
+ }
+
+ /**
+ * @return void
+ * @expectedException InvalidArgumentException
+ * @expectedExceptionMessage Unable to unserialize value.
+ */
+ public function testUnserializeWithWrongSerializedData()
+ {
+ $serializedData = 'test';
+
+ $this->jsonSerializerMock->expects($this->once())
+ ->method('unserialize')
+ ->with($serializedData)
+ ->willReturn('test');
+
+ $this->formDataSerializer->unserialize($serializedData);
+ }
+}
diff -Nuar a/lib/web/mage/backend/validation.js b/lib/web/mage/backend/validation.js
--- a/lib/web/mage/backend/validation.js
+++ b/lib/web/mage/backend/validation.js
@@ -171,6 +171,7 @@
this._submit();
} else {
this._showErrors(response);
+ $(this.element[0]).trigger('afterValidate.error');
$('body').trigger('processStop');
}
},