ACP2E-23: [Magento Cloud] Error message in PDP disappearing quickly

Author: pradeep1819

app/code/Magento/Catalog/view/frontend/web/js/storage-manager.js

@@ -240,7 +240,9 @@ define([
                     ids: data,
                     'type_id': typeId
                 }
-            }, params).done(this.requestHandler.bind(this, name));
+            }, params)
+                .done(this.requestHandler.bind(this, name))
+                .always(this.requestSent = 1);
         }
     });
 });

app/code/Magento/Customer/Test/Mftf/Test/StorefrontAddProductToCartVerifyThatErrorMessageShouldNotDisappearTest.xml

@@ -25,14 +25,16 @@
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">
                 <requiredEntity createDataKey="createCategory"/>
             </createData>
-            <magentoCron stepKey="runCronReindex" groups="index"/>
+            <!--Reindex and flush cache-->
+            <magentoCLI command="cron:run --group=index" stepKey="runCronReindex"/>
         </before>
         <after>
             <deleteData createDataKey="createSimpleProduct" stepKey="deleteProduct"/>
             <deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
             <magentoCLI command="config:set {{DisableSynchronizeWidgetProductsWithBackendStorage.path}} {{DisableSynchronizeWidgetProductsWithBackendStorage.value}}" stepKey="setDisableSynchronizeWidgetProductsWithBackendStorage"/>
         </after>
 
+        <waitForPageLoad time="60" stepKey="waitForPageLoad"/>
         <actionGroup ref="StorefrontOpenProductEntityPageActionGroup" stepKey="openProductPage">
             <argument name="product" value="$$createSimpleProduct$$"/>
         </actionGroup>

app/code/Magento/Theme/CustomerData/Messages.php

@@ -6,9 +6,11 @@
 
 namespace Magento\Theme\CustomerData;
 
+use Magento\Catalog\Model\Product\ProductFrontendAction\Synchronizer;
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\Config;
 use Magento\Framework\App\RequestInterface;
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Message\ManagerInterface as MessageManager;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
@@ -35,30 +37,39 @@ class Messages implements SectionSourceInterface
      */
     private $request;
 
+    /**
+     * @var Config
+     */
+    private $appConfig;
+
     /**
      * Constructor
      *
      * @param MessageManager $messageManager
      * @param InterpretationStrategyInterface $interpretationStrategy
      * @param RequestInterface $request
+     * @param Config $appConfig
      */
     public function __construct(
         MessageManager $messageManager,
         InterpretationStrategyInterface $interpretationStrategy,
-        ?RequestInterface $request = null
+        ?RequestInterface $request = null,
+        ?Config $appConfig = null
     ) {
         $this->messageManager = $messageManager;
         $this->interpretationStrategy = $interpretationStrategy;
-        $this->request = $request ?: \Magento\Framework\App\ObjectManager::getInstance()->get(RequestInterface::class);
+        $this->request = $request ?: ObjectManager::getInstance()->get(RequestInterface::class);
+        $this->appConfig = $appConfig ?: ObjectManager::getInstance()->get(Config::class);
     }
 
     /**
      * @inheritdoc
-     * @throws LocalizedException
      */
     public function getSectionData()
     {
-        $messages = $this->messageManager->getMessages(true);
+        $forceNewSectionTimestampFlg = $this->sectionTimestampFlag();
+
+        $messages = $this->messageManager->getMessages($forceNewSectionTimestampFlg);
         $messageResponse = array_reduce(
             $messages->getItems(),
             function (array $result, MessageInterface $message) {
@@ -70,16 +81,29 @@ function (array $result, MessageInterface $message) {
             },
             []
         );
+        return [
+            'messages' => $messageResponse
+        ];
+    }
 
-        $forceNewSectionTimestamp = $this->request->getParam('force_new_section_timestamp')
-            ?? $this->request->getParam('force_new_section_timestamp');
+    /**
+     * Verify flag value for synchronizing product actions with backend or not.
+     *
+     * @return boolean
+     */
+    private function sectionTimestampFlag(): bool
+    {
+        $forceNewSectionTimestampFlg = true;
 
-        if ('true' === $forceNewSectionTimestamp && empty($messageResponse)) {
-            throw new LocalizedException(__('Session messages already cleared.'));
-        }
+        if ((bool) $this->appConfig->getValue(Synchronizer::ALLOW_SYNC_WITH_BACKEND_PATH)) {
+            $forceNewSectionTimestampFlg = false;
+            $forceNewSectionTimestamp = $this->request->getParam('force_new_section_timestamp')
+                ?? $this->request->getParam('force_new_section_timestamp');
 
-        return [
-            'messages' => $messageResponse,
-        ];
+            if ('true' === $forceNewSectionTimestamp) {
+                $forceNewSectionTimestampFlg = true;
+            }
+        }
+        return $forceNewSectionTimestampFlg;
     }
 }