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

Author: pradeep1819

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

@@ -19,7 +19,7 @@
         </annotations>
 
         <before>
-            <!-- Set in Stores > Configuration > Catalog > Catalog > > Recently Viewed/Compared Products > Synchronize Widget Products With Backend Storage = "Yes" -->
+            <!-- Set in Stores > Configuration > Catalog > Catalog > Recently Viewed/Compared Products > Synchronize Widget Products With Backend Storage = "Yes" -->
             <magentoCLI command="config:set {{EnableSynchronizeWidgetProductsWithBackendStorage.path}} {{EnableSynchronizeWidgetProductsWithBackendStorage.value}}" stepKey="setEnableSynchronizeWidgetProductsWithBackendStorage"/>
             <createData entity="_defaultCategory" stepKey="createCategory"/>
             <createData entity="_defaultProduct" stepKey="createSimpleProduct">

app/code/Magento/Customer/view/frontend/web/js/customer-data-mixin.js

@@ -178,19 +178,11 @@ define([
             var sectionId = 0,
                 sectionDataIds = $.cookieStorage.get('section_data_ids') || {};
 
-            if ($.inArray('cart', _.keys(sections)) !== -1) {
-                $.cookieStorage.set('pdp_qty_error', true);
-            }
-
             _.each(sections, function (sectionData, sectionName) {
                 sectionId = sectionData['data_id'];
                 sectionDataIds[sectionName] = sectionId;
                 storage.set(sectionName, sectionData);
                 storageInvalidation.remove(sectionName);
-
-                if (_.isEmpty(sectionData.messages) && $.cookieStorage.get('pdp_qty_error')) {
-                    return;
-                }
                 buffer.notify(sectionName, sectionData);
             });
             $.cookieStorage.set('section_data_ids', sectionDataIds);
@@ -440,12 +432,5 @@ define([
         }
     });
 
-    /**
-     * Place code to be executed on completion of last outstanding ajax call here
-     */
-    $(document).ajaxStop(function () {
-        $.cookieStorage.set('pdp_qty_error', false);
-    });
-
     return customerData;
 });

app/code/Magento/Customer/view/frontend/web/js/customer-data.js

@@ -7,6 +7,8 @@
 namespace Magento\Theme\CustomerData;
 
 use Magento\Customer\CustomerData\SectionSourceInterface;
+use Magento\Framework\App\RequestInterface;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Message\ManagerInterface as MessageManager;
 use Magento\Framework\Message\MessageInterface;
 use Magento\Framework\View\Element\Message\InterpretationStrategyInterface;
@@ -28,38 +30,56 @@ class Messages implements SectionSourceInterface
      */
     private $interpretationStrategy;
 
+    /**
+     * @var RequestInterface
+     */
+    private $request;
+
     /**
      * Constructor
      *
      * @param MessageManager $messageManager
      * @param InterpretationStrategyInterface $interpretationStrategy
+     * @param RequestInterface $request
      */
     public function __construct(
         MessageManager $messageManager,
-        InterpretationStrategyInterface $interpretationStrategy
+        InterpretationStrategyInterface $interpretationStrategy,
+        ?RequestInterface $request = null
     ) {
         $this->messageManager = $messageManager;
         $this->interpretationStrategy = $interpretationStrategy;
+        $this->request = $request ?: \Magento\Framework\App\ObjectManager::getInstance()->get(RequestInterface::class);
     }
 
     /**
      * @inheritdoc
+     * @throws LocalizedException
      */
     public function getSectionData()
     {
         $messages = $this->messageManager->getMessages(true);
+        $messageResponse = array_reduce(
+            $messages->getItems(),
+            function (array $result, MessageInterface $message) {
+                $result[] = [
+                    'type' => $message->getType(),
+                    'text' => $this->interpretationStrategy->interpret($message)
+                ];
+                return $result;
+            },
+            []
+        );
+
+        $forceNewSectionTimestamp = $this->request->getParam('force_new_section_timestamp')
+            ?? $this->request->getParam('force_new_section_timestamp');
+
+        if ('true' === $forceNewSectionTimestamp && empty($messageResponse)) {
+            throw new LocalizedException(__('Session messages already cleared.'));
+        }
+
         return [
-            'messages' => array_reduce(
-                $messages->getItems(),
-                function (array $result, MessageInterface $message) {
-                    $result[] = [
-                        'type' => $message->getType(),
-                        'text' => $this->interpretationStrategy->interpret($message)
-                    ];
-                    return $result;
-                },
-                []
-            ),
+            'messages' => $messageResponse,
         ];
     }
 }