Fix admin got auto logged out when displaying large number of product reviews

app/code/Magento/Review/Block/Adminhtml/Edit.php

@@ -84,7 +84,6 @@ protected function _construct()
 
         /** @var $actionPager \Magento\Review\Helper\Action\Pager */
         $actionPager = $this->_reviewActionPager;
-        $actionPager->setStorageId('reviews');
 
         $reviewId = $this->getRequest()->getParam('id');
         $prevId = $actionPager->getPreviousItemId($reviewId);

app/code/Magento/Review/Block/Adminhtml/Grid.php

@@ -19,21 +19,21 @@
 class Grid extends \Magento\Backend\Block\Widget\Grid\Extended
 {
     /**
-     * Review action pager
+     * Review action pager helper
      *
      * @var \Magento\Review\Helper\Action\Pager
      */
     protected $_reviewActionPager = null;
 
     /**
-     * Review data
+     * Review helper data
      *
      * @var \Magento\Review\Helper\Data
      */
     protected $_reviewData = null;
 
     /**
-     * Core registry
+     * Magento framework Core registry
      *
      * @var \Magento\Framework\Registry
      */
@@ -93,21 +93,6 @@ protected function _construct()
         $this->setDefaultSort('created_at');
     }
 
-    /**
-     * Save search results
-     *
-     * @return \Magento\Backend\Block\Widget\Grid
-     */
-    protected function _afterLoadCollection()
-    {
-        /** @var $actionPager \Magento\Review\Helper\Action\Pager */
-        $actionPager = $this->_reviewActionPager;
-        $actionPager->setStorageId('reviews');
-        $actionPager->setItems($this->getCollection()->getResultingIds());
-
-        return parent::_afterLoadCollection();
-    }
-
     /**
      * @inheritDoc
      */

app/code/Magento/Review/Helper/Action/Pager.php

@@ -3,147 +3,79 @@
  * Copyright 2013 Adobe
  * All Rights Reserved.
  */
-
 namespace Magento\Review\Helper\Action;
 
-use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\App\Helper\AbstractHelper;
+use Magento\Review\Model\ResourceModel\Review\CollectionFactory;
 
 /**
  * Action pager helper for iterating over search results
  *
  * @api
  * @since 100.0.2
  */
-class Pager extends \Magento\Framework\App\Helper\AbstractHelper
+class Pager extends AbstractHelper
 {
-    const STORAGE_PREFIX = 'search_result_ids';
-
-    /**
-     * Storage id
-     *
-     * @var int
-     */
-    protected $_storageId = null;
-
     /**
-     * Array of items
+     * Review collection model factory
      *
-     * @var array
+     * @var CollectionFactory
      */
-    protected $_items = null;
+    protected $reviewCollectionFactory;
 
     /**
-     * Backend session model
+     * Pager constructor.
      *
-     * @var \Magento\Backend\Model\Session
-     */
-    protected $_backendSession;
-
-    /**
      * @param \Magento\Framework\App\Helper\Context $context
-     * @param \Magento\Backend\Model\Session $backendSession
+     * @param CollectionFactory $reviewCollectionFactory
      */
     public function __construct(
         \Magento\Framework\App\Helper\Context $context,
-        \Magento\Backend\Model\Session $backendSession
+        CollectionFactory $reviewCollectionFactory
     ) {
-        $this->_backendSession = $backendSession;
         parent::__construct($context);
+        $this->reviewCollectionFactory = $reviewCollectionFactory;
     }
 
     /**
-     * Set storage id
-     *
-     * @param int $storageId
-     * @return void
-     */
-    public function setStorageId($storageId)
-    {
-        $this->_storageId = $storageId;
-    }
-
-    /**
-     * Set items to storage
-     *
-     * @param array $items
-     * @return $this
-     */
-    public function setItems(array $items)
-    {
-        $this->_items = $items;
-        $this->_backendSession->setData($this->_getStorageKey(), $this->_items);
-
-        return $this;
-    }
-
-    /**
-     * Load stored items
-     *
-     * @return void
-     */
-    protected function _loadItems()
-    {
-        if ($this->_items === null) {
-            $this->_items = (array)$this->_backendSession->getData($this->_getStorageKey());
-        }
-    }
-
-    /**
-     * Get next item id
+     * Get the next review id.
      *
      * @param int $id
-     * @return int|bool
+     * @return int|false
      */
-    public function getNextItemId($id)
+    public function getNextItemId($id): int|false
     {
-        $position = $this->_findItemPositionByValue($id);
-        if ($position === false || $position == count($this->_items) - 1) {
-            return false;
-        }
-
-        return $this->_items[$position + 1];
+        return $this->getRelativeReviewId($id, 'gt', 'ASC');
     }
 
     /**
-     * Get previous item id
+     * Get the previous review id.
      *
      * @param int $id
-     * @return int|bool
+     * @return int|false
      */
-    public function getPreviousItemId($id)
+    public function getPreviousItemId($id): int|false
     {
-        $position = $this->_findItemPositionByValue($id);
-        if ($position === false || $position == 0) {
-            return false;
-        }
-
-        return $this->_items[$position - 1];
+        return $this->getRelativeReviewId($id, 'lt', 'DESC');
     }
 
     /**
-     * Return item position based on passed in value
+     * Get the review id based on comparison and order.
      *
-     * @param mixed $value
-     * @return int|bool
-     */
-    protected function _findItemPositionByValue($value)
-    {
-        $this->_loadItems();
-        return array_search($value, $this->_items);
-    }
-
-    /**
-     * Get storage key
-     *
-     * @return string
-     * @throws \Magento\Framework\Exception\LocalizedException
+     * @param int $id
+     * @param string $operator
+     * @param string $order
+     * @return int|false
      */
-    protected function _getStorageKey()
+    private function getRelativeReviewId($id, $operator, $order): int|false
     {
-        if (!$this->_storageId) {
-            throw new LocalizedException(__("The storage key wasn't set. Add the storage key and try again."));
-        }
-
-        return self::STORAGE_PREFIX . $this->_storageId;
+        $collection = $this->reviewCollectionFactory->create();
+        $collection->addFieldToFilter('main_table.review_id', [$operator => $id])
+            ->setOrder('main_table.review_id', $order)
+            ->setPageSize(1)
+            ->setCurPage(1);
+
+        $item = $collection->getFirstItem();
+        return $item->getId() ? (int)$item->getId() : false;
     }
 }

app/code/Magento/Review/Model/ResourceModel/Review/Product/Collection.php

@@ -9,6 +9,7 @@
 use Magento\Eav\Model\Entity\Attribute\AbstractAttribute;
 use Magento\Framework\DB\Select;
 use Magento\Framework\EntityManager\MetadataPool;
+use Magento\Review\Helper\Action\Pager;
 
 /**
  * Review Product Collection
@@ -405,6 +406,8 @@ public function getAllIds($limit = null, $offset = null)
      * Get result sorted ids
      *
      * @return array
+     * @deprecated This method is not being used to fetch ids anymore.We use it only to support backward compatibility
+     * @see Pager
      */
     public function getResultingIds()
     {