MC-36048: Unexpected behavior of sorting in the Magento Admin Panel

Author: OlgaVasyltsun

app/code/Magento/Theme/Plugin/Data/Collection.php

@@ -0,0 +1,26 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\Theme\Plugin\Data;
+
+/**
+ * Plugin to return real current page even if it greater then collection size.
+ *
+ * It is necessary to return no values when we reached the last page for api requests
+ */
+class Collection
+{
+    public function afterGetCurPage(\Magento\Framework\Data\Collection $subject, int $result, int $displacement = 0)
+    {
+        if ($result > $subject->getLastPageNumber()) {
+            $result = $subject->getLastPageNumber();
+        }
+
+        return $result;
+    }
+
+}

app/code/Magento/Theme/etc/adminhtml/di.xml

@@ -41,4 +41,7 @@
             </argument>
         </arguments>
     </type>
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>

app/code/Magento/Theme/etc/frontend/di.xml

@@ -37,4 +37,8 @@
             <argument name="filePath" xsi:type="string">css/critical.css</argument>
         </arguments>
     </type>
+
+    <type name="Magento\Framework\Data\Collection">
+        <plugin name="currentPageDetection" type="Magento\Theme\Plugin\Data\Collection" />
+    </type>
 </config>