ACP2E-2042: Admin grid saved filter does not working as expected

Author: pradeep1819

app/code/Magento/Ui/Controller/Adminhtml/Bookmark/Save.php

@@ -5,10 +5,13 @@
  */
 namespace Magento\Ui\Controller\Adminhtml\Bookmark;
 
-use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
 use Magento\Authorization\Model\UserContextInterface;
 use Magento\Backend\App\Action\Context;
+use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
+use Magento\Framework\App\ObjectManager;
+use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Json\DecoderInterface;
+use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\View\Element\UiComponentFactory;
 use Magento\Ui\Api\BookmarkManagementInterface;
 use Magento\Ui\Api\BookmarkRepositoryInterface;
@@ -55,11 +58,12 @@ class Save extends AbstractAction implements HttpPostActionInterface
     /**
      * @var DecoderInterface
      * @deprecated 101.1.0
+     * @see Replaced the usage of Magento\Framework\Json\DecoderInterface by Magento\Framework\Serialize\Serializer\Json
      */
     protected $jsonDecoder;
 
     /**
-     * @var \Magento\Framework\Serialize\Serializer\Json
+     * @var Json
      */
     private $serializer;
 
@@ -71,7 +75,7 @@ class Save extends AbstractAction implements HttpPostActionInterface
      * @param BookmarkInterfaceFactory $bookmarkFactory
      * @param UserContextInterface $userContext
      * @param DecoderInterface $jsonDecoder
-     * @param \Magento\Framework\Serialize\Serializer\Json|null $serializer
+     * @param Json|null $serializer
      * @throws \RuntimeException
      */
     public function __construct(
@@ -82,24 +86,24 @@ public function __construct(
         BookmarkInterfaceFactory $bookmarkFactory,
         UserContextInterface $userContext,
         DecoderInterface $jsonDecoder,
-        \Magento\Framework\Serialize\Serializer\Json $serializer = null
+        Json $serializer = null
     ) {
         parent::__construct($context, $factory);
         $this->bookmarkRepository = $bookmarkRepository;
         $this->bookmarkManagement = $bookmarkManagement;
         $this->bookmarkFactory = $bookmarkFactory;
         $this->userContext = $userContext;
         $this->jsonDecoder = $jsonDecoder;
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()
-            ->get(\Magento\Framework\Serialize\Serializer\Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()
+            ->get(Json::class);
     }
 
     /**
      * Action for AJAX request
      *
      * @return void
      * @throws \InvalidArgumentException
-     * @throws \LogicException
+     * @throws \LogicException|LocalizedException
      */
     public function execute()
     {
@@ -126,6 +130,7 @@ public function execute()
                     $bookmark->getTitle(),
                     $jsonData
                 );
+                $this->updateCurrentBookmarkConfig($data);
 
                 break;
 
@@ -134,7 +139,7 @@ public function execute()
                     $this->updateBookmark(
                         $bookmark,
                         $identifier,
-                        isset($data['label']) ? $data['label'] : '',
+                        $data['label'] ?? '',
                         $jsonData
                     );
                     $this->updateCurrentBookmark($identifier);
@@ -176,32 +181,31 @@ protected function updateBookmark(BookmarkInterface $bookmark, $identifier, $tit
      *
      * @param string $identifier
      * @return void
+     * @throws LocalizedException
      */
     protected function updateCurrentBookmark($identifier)
     {
         $bookmarks = $this->bookmarkManagement->loadByNamespace($this->_request->getParam('namespace'));
         $currentConfig = null;
         foreach ($bookmarks->getItems() as $bookmark) {
-            if ($bookmark->getIdentifier() === self::CURRENT_IDENTIFIER) {
+            if ($bookmark->getIdentifier() == $identifier) {
                 $current = $bookmark->getConfig();
-                $currentConfig = $current[self::CURRENT_IDENTIFIER];
-                break;
+                $currentConfig = $current['views'][$bookmark->getIdentifier()]['data'];
+                $bookmark->setCurrent(true);
+            } else {
+                $bookmark->setCurrent(false);
             }
+            $this->bookmarkRepository->save($bookmark);
         }
 
         foreach ($bookmarks->getItems() as $bookmark) {
-            if ($bookmark->getCurrent() && $currentConfig !== null) {
+            if ($bookmark->getIdentifier() === self::CURRENT_IDENTIFIER && $currentConfig !== null) {
                 $bookmarkConfig = $bookmark->getConfig();
-                $bookmarkConfig['views'][$bookmark->getIdentifier()]['data'] = $currentConfig;
+                $bookmarkConfig[self::CURRENT_IDENTIFIER] = $currentConfig;
                 $bookmark->setConfig($this->serializer->serialize($bookmarkConfig));
+                $this->bookmarkRepository->save($bookmark);
+                break;
             }
-
-            if ($bookmark->getIdentifier() == $identifier) {
-                $bookmark->setCurrent(true);
-            } else {
-                $bookmark->setCurrent(false);
-            }
-            $this->bookmarkRepository->save($bookmark);
         }
     }
 
@@ -226,4 +230,33 @@ protected function checkBookmark($identifier)
 
         return $result;
     }
+
+    /**
+     * Update current bookmark config data
+     *
+     * @param array $data
+     * @return void
+     * @throws LocalizedException
+     */
+    private function updateCurrentBookmarkConfig(array $data): void
+    {
+        $bookmarks = $this->bookmarkManagement->loadByNamespace($this->_request->getParam('namespace'));
+        foreach ($bookmarks->getItems() as $bookmark) {
+            if ($bookmark->getCurrent()) {
+                $bookmarkConfig = $bookmark->getConfig();
+                $existingConfig = $bookmarkConfig['views'][$bookmark->getIdentifier()]['data'] ?? null;
+                $currentConfig = $data[self::CURRENT_IDENTIFIER] ?? null;
+                if ($existingConfig && $currentConfig) {
+                    if ($existingConfig['filters'] === $currentConfig['filters']
+                        && $existingConfig['positions'] !== $currentConfig['positions']
+                    ) {
+                        $bookmarkConfig['views'][$bookmark->getIdentifier()]['data'] = $data[self::CURRENT_IDENTIFIER];
+                        $bookmark->setConfig($this->serializer->serialize($bookmarkConfig));
+                        $this->bookmarkRepository->save($bookmark);
+                    }
+                }
+                break;
+            }
+        }
+    }
 }