Skip to content

Commit e29f0fa

Browse files
le0n4ikle0n4ik
committed
MC-33556: [PB] Degradation in product Edit/Save scenarios
 - CR Fixes
1 parent e6e8018 commit e29f0fa

13 files changed

+37
-32
lines changed

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

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
/**
1818
* Provide configuration to the admin JavaScript app
1919
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
20+
* @SuppressWarnings(PHPMD.TooManyFields)
2021
*
2122
* @api
2223
*/
@@ -35,8 +36,8 @@ class Config
3536
const TEMPLATE_APPLY_RESOURCE = 'Magento_PageBuilder::template_apply';
3637

3738
private const CONTENT_TYPE_CACHE_ID = 'CONTENT_TYPE';
38-
private const TINY_MCE_CONFIG_CACHE_ID = 'TYNY_MCE_CONFIG';
39-
private const WIDGET_BREAKPOINS_CACHE_ID = 'WIDGET_BREAKPOINS';
39+
private const TINY_MCE_CONFIG_CACHE_ID = 'TINY_MCE_CONFIG';
40+
private const WIDGET_BREAKPOINTS_CACHE_ID = 'WIDGET_BREAKPOINS';
4041

4142
/**
4243
* @var \Magento\PageBuilder\Model\ConfigInterface
@@ -377,19 +378,21 @@ private function getCachedTinyMceConfig(): array
377378
*/
378379
private function getCachedWidgetBreakpoints(): array
379380
{
380-
$cache = $this->getCache(self::WIDGET_BREAKPOINS_CACHE_ID);
381+
$cache = $this->getCache(self::WIDGET_BREAKPOINTS_CACHE_ID);
381382
if (empty($cache)) {
382383
$cache = $this->widgetInitializerConfig->getBreakpoints();
383-
$this->saveCache($cache, self::WIDGET_BREAKPOINS_CACHE_ID);
384+
$this->saveCache($cache, self::WIDGET_BREAKPOINTS_CACHE_ID);
384385
}
385386
return $cache;
386387
}
387388

388389
/**
389-
* @param $cacheIdentifier
390+
* Get configuration cache by identifier
391+
*
392+
* @param string $cacheIdentifier
390393
* @return array
391394
*/
392-
private function getCache($cacheIdentifier): array
395+
private function getCache(string $cacheIdentifier): array
393396
{
394397
$serializedData = $this->cache->load($cacheIdentifier);
395398
$cache = $serializedData
@@ -400,10 +403,12 @@ private function getCache($cacheIdentifier): array
400403
}
401404

402405
/**
406+
* Save configuration cache for identifier
407+
*
403408
* @param array $data
404-
* @param $cacheIdentifier
409+
* @param string $cacheIdentifier
405410
*/
406-
private function saveCache(array $data, $cacheIdentifier): void
411+
private function saveCache(array $data, string $cacheIdentifier): void
407412
{
408413
$this->cache->save($this->serializer->serialize($data), $cacheIdentifier);
409414
}

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddImageToWYSIWYGBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="AdminAddImageToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="switchToTinyMCE4"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddVariableToWYSIWYGBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="AdminAddVariableToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="switchToTinyMCE4"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="AdminAddWidgetToWYSIWYGBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="switchToTinyMCE4"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="AdminAddWidgetToWYSIWYGWithCMSStaticBlockTypeTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="switchToTinyMCE4"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/AdminCreateDuplicatedCmsBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="AdminCreateDuplicatedCmsBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginGetFromGeneralFile"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="logout"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/CheckStaticBlocksTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="CheckStaticBlocksTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCMSBlockDisablePageBuilderTest/VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="VerifyTinyMCEv4IsNativeWYSIWYGOnBlockTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="switchToTinyMCE4"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" after="disableWYSIWYG"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontBundleProductDetailsTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="StorefrontBundleProductDetailsTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder" after="loginToAdminPanel"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder" before="logout"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

‎app/code/Magento/PageBuilder/Test/Mftf/Test/AdminCatalogProductDisablePageBuilderTest/StorefrontSwatchAttributesDisplayInWidgetCMSTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
<test name="StorefrontSwatchAttributesDisplayInWidgetCMSTest">
1111
<before>
1212
<magentoCLI command="config:set cms/pagebuilder/enabled 0" stepKey="disablePageBuilder"/>
13-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
13+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="disablePageBuilder"/>
1414
</before>
1515
<after>
1616
<magentoCLI command="config:set cms/pagebuilder/enabled 1" stepKey="enablePageBuilder"/>
17-
<magentoCLI command="cache:clean config" stepKey="flushCache"/>
17+
<magentoCLI command="cache:clean config" stepKey="flushCache" after="enablePageBuilder"/>
1818
</after>
1919
</test>
2020
</tests>

0 commit comments

Comments
 (0)