Skip to content

Commit 571d591

Browse files
dhaeckerdhaecker
committed
Merge remote-tracking branch 'mainline/develop' into MAGETWO-92775-tabs
2 parents 7474571 + a8a307f commit 571d591

File tree

100 files changed

+6020
-1504
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

100 files changed

+6020
-1504
lines changed

‎app/code/Magento/PageBuilder/Block/GoogleMapsApiBlock.php renamed to ‎app/code/Magento/PageBuilder/Block/GoogleMapsApi.php

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,31 @@
1010
/**
1111
* @api
1212
*/
13-
class GoogleMapsApiBlock extends \Magento\Framework\View\Element\Template
13+
class GoogleMapsApi extends \Magento\Framework\View\Element\Template
1414
{
1515
const GOOGLE_MAPS_API_KEY_PATH = 'cms/pagebuilder/google_maps_api_key';
1616
const GOOGLE_MAPS_LIBRARY_URL = 'https://maps.googleapis.com/maps/api/js?v=3&key=%s';
17+
const GOOGLE_MAPS_STYLE_PATH = 'cms/pagebuilder/google_maps_style';
1718

1819
/**
1920
* Generate URL for retrieving Google Maps Javascript API
2021
*
2122
* @return string
2223
*/
23-
public function getGoogleMapsApiPath(): string
24+
public function getLibraryUrl(): string
2425
{
2526
$apiKey = $this->_scopeConfig->getValue(self::GOOGLE_MAPS_API_KEY_PATH);
2627
$libraryUrlWithKey = sprintf(self::GOOGLE_MAPS_LIBRARY_URL, $apiKey);
2728
return $libraryUrlWithKey;
2829
}
30+
31+
/**
32+
* Retrieve Google Maps Styles from Configurations
33+
*
34+
* @return string|null
35+
*/
36+
public function getStyle(): ?string
37+
{
38+
return $this->_scopeConfig->getValue(self::GOOGLE_MAPS_STYLE_PATH);
39+
}
2940
}

‎app/code/Magento/PageBuilder/Model/Config.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\PageBuilder\Model;
710

811
use Magento\Framework\App\Config\ScopeConfigInterface;
@@ -43,9 +46,9 @@ public function getGroups()
4346
/**
4447
* Return all content types
4548
*
46-
* @return array|mixed|null
49+
* @return array
4750
*/
48-
public function getContentTypes()
51+
public function getContentTypes(): array
4952
{
5053
return $this->get('types');
5154
}
@@ -55,7 +58,7 @@ public function getContentTypes()
5558
*
5659
* @return bool
5760
*/
58-
public function isEnabled()
61+
public function isEnabled(): bool
5962
{
6063
return (bool)$this->scopeConfig->getValue(
6164
\Magento\PageBuilder\Model\Config::IS_PAGEBUILDER_ENABLED

‎app/code/Magento/PageBuilder/Model/Config/ContentType/AdditionalData/Parser.php

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
7+
declare(strict_types=1);
8+
9+
namespace Magento\PageBuilder\Model\Config\ContentType\AdditionalData;
10+
11+
use Magento\Framework\Data\Argument\InterpreterInterface;
12+
13+
/**
14+
* Additional Data Parser for evaluation of data providers at runtime
15+
*/
16+
class Parser
17+
{
18+
/**
19+
* @var InterpreterInterface
20+
*/
21+
private $argumentInterpreter;
22+
23+
/**
24+
* @param InterpreterInterface $argumentInterpreter
25+
*/
26+
public function __construct(
27+
InterpreterInterface $argumentInterpreter
28+
) {
29+
$this->argumentInterpreter = $argumentInterpreter;
30+
}
31+
32+
/**
33+
* Convert and evaluate additional data from arguments nodes to array
34+
*
35+
* @param array $additionalData
36+
* @return array
37+
*/
38+
public function toArray(array $additionalData): array
39+
{
40+
$parsedAdditionalData = [];
41+
42+
foreach ($additionalData as $key => $additionalDataItem) {
43+
$additionalDataItem = $this->argumentInterpreter->evaluate($additionalDataItem);
44+
$parsedAdditionalData[$key] = $this->evaluateProviders($additionalDataItem);
45+
}
46+
47+
return $parsedAdditionalData;
48+
}
49+
50+
/**
51+
* Evaluate ProviderInterface objects
52+
*
53+
* @param array $additionalDataItem
54+
* @return array
55+
*/
56+
private function evaluateProviders(array $additionalDataItem): array
57+
{
58+
$processedData = [];
59+
60+
foreach ($additionalDataItem as $key => $value) {
61+
$processedData[$key] = $value;
62+
63+
if (is_array($value)) {
64+
$processedData[$key] = $this->evaluateProviders($additionalDataItem[$key]);
65+
} elseif (is_object($value) && $value instanceof ProviderInterface) {
66+
$processedData[$key] = $value->getData($key)[$key];
67+
}
68+
}
69+
70+
return $processedData;
71+
}
72+
}

‎app/code/Magento/PageBuilder/Model/Config/ContentType/Converter.php

Lines changed: 8 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@
99
namespace Magento\PageBuilder\Model\Config\ContentType;
1010

1111
use Magento\Framework\ObjectManager\Config\Mapper\ArgumentParser;
12-
use Magento\Framework\Data\Argument\InterpreterInterface;
13-
use Magento\PageBuilder\Model\Config\ContentType\AdditionalData\ProviderInterface;
1412

1513
class Converter implements \Magento\Framework\Config\ConverterInterface
1614
{
@@ -19,22 +17,14 @@ class Converter implements \Magento\Framework\Config\ConverterInterface
1917
*/
2018
private $parser;
2119

22-
/**
23-
* @var InterpreterInterface
24-
*/
25-
private $argumentInterpreter;
26-
2720
/**
2821
* Converter constructor.
2922
* @param ArgumentParser $parser
30-
* @param InterpreterInterface $argumentInterpreter
3123
*/
3224
public function __construct(
33-
ArgumentParser $parser,
34-
InterpreterInterface $argumentInterpreter
25+
ArgumentParser $parser
3526
) {
3627
$this->parser = $parser;
37-
$this->argumentInterpreter = $argumentInterpreter;
3828
}
3929

4030
/**
@@ -247,15 +237,17 @@ private function convertAdditionalData(\DOMElement $elementNode): array
247237
if (!$xmlArgumentsNodes->length) {
248238
return $additionalData;
249239
}
250-
$typeArguments = [];
240+
251241
/** @var $xmlArgumentsNode \DOMElement */
252242
foreach ($xmlArgumentsNodes as $xmlArgumentsNode) {
253243
$parsedArgumentsData = $this->parser->parse($xmlArgumentsNode);
254244
$argumentName = $xmlArgumentsNode->attributes->getNamedItem('name')->nodeValue;
255-
$typeArguments[$argumentName] = $this->argumentInterpreter->evaluate(
256-
$parsedArgumentsData
257-
);
258-
$additionalData += $this->toArray($typeArguments);
245+
246+
if (!isset($additionalData[$argumentName])) {
247+
$additionalData[$argumentName] = [];
248+
}
249+
250+
$additionalData[$argumentName] += $parsedArgumentsData;
259251
}
260252

261253
return $additionalData;
@@ -465,25 +457,4 @@ private function getAttributeValue(\DOMElement $attributeNode, $attributeName)
465457
? $attributeNode->attributes->getNamedItem($attributeName)->nodeValue
466458
: null;
467459
}
468-
469-
/**
470-
* Convert arguments node from additional data to array
471-
* @param array $typeArguments
472-
* @return array
473-
*/
474-
private function toArray(array $typeArguments)
475-
{
476-
$processedData = [];
477-
foreach ($typeArguments as $key => $value) {
478-
if (is_array($value)) {
479-
$processedData[$key] = $this->toArray($typeArguments[$key]);
480-
} elseif (is_object($value) && $value instanceof ProviderInterface) {
481-
$processedData[$key] = $value->getData($key)[$key];
482-
} else {
483-
$processedData[$key] = $value;
484-
}
485-
}
486-
487-
return $processedData;
488-
}
489460
}

‎app/code/Magento/PageBuilder/Model/Stage/Config.php

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
69
namespace Magento\PageBuilder\Model\Stage;
710

811
use Magento\Framework\UrlInterface;
@@ -37,26 +40,34 @@ class Config
3740
*/
3841
private $frontendUrlBuilder;
3942

43+
/**
44+
* @var \Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser
45+
*/
46+
private $additionalDataParser;
47+
4048
/**
4149
* Constructor
4250
*
4351
* @param \Magento\PageBuilder\Model\Config\ConfigInterface $config
4452
* @param Config\UiComponentConfig $uiComponentConfig
4553
* @param \Magento\Framework\UrlInterface $urlBuilder
4654
* @param \Magento\Framework\Url $frontendUrlBuilder
55+
* @param \Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser $additionalDataParser
4756
* @param array $data
4857
*/
4958
public function __construct(
5059
\Magento\PageBuilder\Model\Config\ConfigInterface $config,
5160
Config\UiComponentConfig $uiComponentConfig,
5261
\Magento\Framework\UrlInterface $urlBuilder,
5362
\Magento\Framework\Url $frontendUrlBuilder,
63+
\Magento\PageBuilder\Model\Config\ContentType\AdditionalData\Parser $additionalDataParser,
5464
array $data = []
5565
) {
5666
$this->config = $config;
5767
$this->uiComponentConfig = $uiComponentConfig;
5868
$this->urlBuilder = $urlBuilder;
5969
$this->frontendUrlBuilder = $frontendUrlBuilder;
70+
$this->additionalDataParser = $additionalDataParser;
6071
$this->data = $data;
6172
}
6273

@@ -141,7 +152,9 @@ private function flattenContentTypeData($name, $contentType)
141152
'allowed_parents' => isset($contentType['allowed_parents']) ? $contentType['allowed_parents'] : [],
142153
'readers' => isset($contentType['readers']) ? $contentType['readers'] : [],
143154
'appearances' => isset($contentType['appearances']) ? $contentType['appearances'] : [],
144-
'additional_data' => isset($contentType['additional_data']) ? $contentType['additional_data'] : [],
155+
'additional_data' => isset($contentType['additional_data'])
156+
? $this->additionalDataParser->toArray($contentType['additional_data'])
157+
: [],
145158
'data_mapping' => isset($contentType['data_mapping']) ? $contentType['data_mapping'] : [],
146159
'is_visible' => isset($contentType['is_visible']) && $contentType['is_visible'] === 'false' ? false : true
147160
];

‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Driver.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ public function render(array $itemData, array $additionalData = [])
5353
$rootElementAttributes = [
5454
'data-role' => 'banner',
5555
'data-appearance' => 'poster',
56-
'data-show-button' => 'never_show',
57-
'data-show-overlay' => 'never_show',
56+
'data-show-button' => 'never',
57+
'data-show-overlay' => 'never',
5858
'class' => $eavData['css_classes'] ?? ''
5959
];
6060

‎app/code/Magento/PageBuilder/Setup/DataConverter/Renderer/Map.php

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,6 @@ public function render(array $itemData, array $additionalData = [])
6565

6666
$style = $this->styleExtractor->extractStyle($formData);
6767
if ($style) {
68-
if (isset($eavData['map'])) {
69-
$style .= ' display: inline-block;';
70-
} else {
71-
$style .= ' display: none;';
72-
}
7368
$this->rootElementAttributes['style'] = $style;
7469
}
7570
}

‎app/code/Magento/PageBuilder/Test/Mftf/ActionGroup/ActionGroup.xml

Lines changed: 36 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -555,6 +555,15 @@
555555
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
556556
<waitForElementVisible time="10" selector="{{PageBuilderActionsSection.editFormUploadedImage(property.section, property.fieldName)}}" stepKey="waitForImageUploaded"/>
557557
</actionGroup>
558+
<actionGroup name="clickSelectFromGallerySlideOut">
559+
<arguments>
560+
<argument name="property"/>
561+
</arguments>
562+
<waitForElementVisible selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="waitForSelectFromGalleryBtn"/>
563+
<click selector="{{EditPanelForm.selectFromGalleryBtn(property.section, property.fieldName)}}" stepKey="clickSelectFromGalleryBtn"/>
564+
<waitForPageLoad stepKey="waitForPageLoad"/>
565+
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMaskToDisappear"/>
566+
</actionGroup>
558567
<actionGroup name="conditionalClickSlideOutPanelFieldGeneral">
559568
<arguments>
560569
<argument name="property"/>
@@ -600,7 +609,7 @@
600609
<argument name="property"/>
601610
</arguments>
602611
<waitForElement selector="{{PageBuilderActionsSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElement" />
603-
<waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.fileType)}}" stepKey="seeUploadedFile"/>
612+
<waitForElementVisible selector="{{PageBuilderActionsSection.editFormUploadedImageSource(property.section, property.fieldName, property.fileName, property.extension)}}" stepKey="seeUploadedFile"/>
604613
</actionGroup>
605614
<actionGroup name="seeNoImageUploadedOnSlideOut">
606615
<arguments>
@@ -677,11 +686,20 @@
677686
<waitForElement time="2" selector="{{PageBuilderColumnSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="waitForElementVisible"/>
678687
<dontSeeCheckboxIsChecked selector="{{PageBuilderColumnSection.panelFieldControl(property.section, property.fieldName)}}" stepKey="dontSeeOptionIsCheckedProperty"/>
679688
</actionGroup>
689+
<actionGroup name="openAndValidateColorPickerValue">
690+
<arguments>
691+
<argument name="color" type="string"/>
692+
</arguments>
693+
<waitForElementVisible selector="{{PageBuilderActionsSection.panelColorSwatch(PageBuilderBackgroundColor_Default.section, PageBuilderBackgroundColor_Default.fieldName)}}" stepKey="waitForColorSwatch"/>
694+
<click selector="{{PageBuilderActionsSection.panelColorSwatch(PageBuilderBackgroundColor_Default.section, PageBuilderBackgroundColor_Default.fieldName)}}" stepKey="clickColorSwatch"/>
695+
<waitForElementVisible selector="{{ColorPicker.colorPickerWindow}}" stepKey="waitForColorPickerWindow"/>
696+
<seeInField selector="{{ColorPicker.inputField}}" userInput="{{color}}" stepKey="seeExpectedColor"/>
697+
</actionGroup>
680698
<actionGroup name="seeColorInColorSwatch">
681699
<arguments>
682700
<argument name="property"/>
683701
</arguments>
684-
<waitForElementVisible selector="{{PageBuilderActionsSection.panelColorSwatchColor(property.section, property.fieldName, property.rgb)}}" stepKey="waitForColorSwatch"/>
702+
<waitForElementVisible selector="{{PageBuilderActionsSection.panelColorSwatchColor(property.section, property.fieldName, property.rgb)}}" stepKey="waitForColorSwatchColor"/>
685703
</actionGroup>
686704
<actionGroup name="seeNoColorInColorSwatch">
687705
<arguments>
@@ -695,12 +713,25 @@
695713
</arguments>
696714
<attachFile userInput="{{property.value}}" selector='{{PageBuilderColumnSection.panelFieldControl(property.section, property.fieldName)}}' stepKey="attachBackgroundImageFile"/>
697715
<waitForLoadingMaskToDisappear stepKey="waitForLoading"/>
698-
<waitForElementVisible selector="{{PageBuilderColumnSection.backgroundImagePreview}}" stepKey="waitForImageUpload"/>
716+
<waitForElementVisible selector="{{EditPanelForm.backgroundImagePreview}}" stepKey="waitForImageUpload"/>
717+
</actionGroup>
718+
<actionGroup name="attachInvalidFileOnSlideOut">
719+
<arguments>
720+
<argument name="property"/>
721+
</arguments>
722+
<attachFile userInput="{{property.value}}" selector='{{PageBuilderColumnSection.panelFieldControl(property.section, property.fieldName)}}' stepKey="attachBackgroundImageFile"/>
723+
<waitForPageLoad stepKey="waitForPageLoad"/>
724+
<waitForElementVisible selector="{{EditPanelForm.invalidUploadTitle}}" stepKey="waitForInvalidUploadTitle"/>
725+
<waitForElementVisible selector="{{EditPanelForm.invalidUploadMessage(property.errorMessage)}}" stepKey="waitForInvalidUploadMessage"/>
726+
<waitForElementVisible selector="{{EditPanelForm.invalidUploadOkBtn}}" stepKey="waitForInvalidUploadBtn"/>
727+
<click selector="{{EditPanelForm.invalidUploadOkBtn}}" stepKey="clickInvalidUploadBtn"/>
728+
<waitForElementNotVisible selector="{{EditPanelForm.invalidUploadTitle}}" stepKey="waitForModalGone"/>
729+
<dontSeeElementInDOM selector="{{EditPanelForm.backgroundImagePreview}}" stepKey="dontSeeImage"/>
699730
</actionGroup>
700731
<actionGroup name="saveEditPanelSettings">
701732
<waitForLoadingMaskToDisappear stepKey="waitForLoadingMask"/>
702-
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="waitForColumnSaveButton"/>
703-
<click selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="clickSaveColumn"/>
733+
<waitForElementVisible time="5" selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="waitForSaveButton"/>
734+
<click selector="{{PageBuilderActionsSection.editFormSave}}" stepKey="clickSaveButton"/>
704735
<waitForPageLoad time="30" stepKey="waitForStageToLoad"/>
705736
<waitForElementNotVisible time="5" selector="{{PageBuilderActionsSection.editForm}}" stepKey="waitForEditFormNotVisible"/>
706737
<waitForElementVisible time="10" selector="{{CmsNewPagePageActionsSection.saveAndContinueEdit}}" stepKey="waitForCmsPageSaveButton"/>

0 commit comments

Comments
 (0)