Use original route for '*' in getUrl during ajax paging

Resolves #56
hyva-themes · Jul 1, 2021 · f8ee249 · f8ee249
1 parent 98f42da
commit f8ee249
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 0 deletions.
diff --git a/Controller/Adminhtml/Ajax/Paging.php b/Controller/Adminhtml/Ajax/Paging.php
@@ -42,6 +42,7 @@ public function __construct(
     public function execute()
     {
         try {
+            $this->setOrigRoute($this->request);
             $result = [
                 'grid_html' => $this->gridBlockRenderer->renderGrid($this->request->getParam('gridName', '')),
                 'message'   => null,
@@ -57,4 +58,20 @@ public function execute()
 
         return $json;
     }
+
+    private function setOrigRoute(RequestInterface $request): void
+    {
+        if ($request instanceof \Magento\Framework\App\Request\Http) {
+            $origRoute = explode('/', $request->getParam('origRoute', ''));
+            if ($origRoute[0] ?? false) {
+                $request->setRouteName($origRoute[0]);
+            }
+            if ($origRoute[1] ?? false) {
+                $request->setControllerName($origRoute[1]);
+            }
+            if ($origRoute[2] ?? false) {
+                $request->setActionName($origRoute[2]);
+            }
+        }
+    }
 }
diff --git a/Controller/Ajax/Paging.php b/Controller/Ajax/Paging.php
@@ -4,6 +4,7 @@
 
 use Hyva\Admin\Model\GridBlockRenderer;
 use Magento\Framework\App\ActionInterface;
+use Magento\Framework\App\Request\Http;
 use Magento\Framework\App\RequestInterface;
 use Magento\Framework\Controller\Result\JsonFactory as JsonResultFactory;
 
@@ -33,6 +34,7 @@ public function __construct(RequestInterface $request, GridBlockRenderer $gridBl
 
     public function execute()
     {
+        $this->setOrigRoute($this->request);
         try {
             $result = [
                 'grid_html' => $this->gridBlockRenderer->renderGrid($this->request->getParam('gridName', '')),
@@ -49,4 +51,20 @@ public function execute()
 
         return $json;
     }
+
+    private function setOrigRoute(RequestInterface $request): void
+    {
+        if ($request instanceof \Magento\Framework\App\Request\Http) {
+            $origRoute = explode('/', $request->getParam('origRoute', ''));
+            if ($origRoute[0] ?? false) {
+                $request->setRouteName($origRoute[0]);
+            }
+            if ($origRoute[1] ?? false) {
+                $request->setControllerName($origRoute[1]);
+            }
+            if ($origRoute[2] ?? false) {
+                $request->setActionName($origRoute[2]);
+            }
+        }
+    }
 }
diff --git a/ViewModel/HyvaGrid/Navigation.php b/ViewModel/HyvaGrid/Navigation.php
@@ -2,6 +2,7 @@
 
 namespace Hyva\Admin\ViewModel\HyvaGrid;
 
+use Magento\Framework\HTTP\PhpEnvironment\Request as HttpRequest;
 use Magento\Framework\View\Element\Template;
 use Magento\Framework\View\LayoutInterface;
 use function array_column as pick;
@@ -226,6 +227,7 @@ private function buildAjaxUrl(string $route, array $params): string
     {
         $nonNsQueryParams = filter([
             'ajax'     => $this->isAjaxEnabled() ? '1' : null,
+            'origRoute' => $this->getCurrentRoute(),
             'gridName' => $this->isAjaxEnabled() ? $this->gridName : null,
         ]);
         return $this->buildUrl($route, $params, $nonNsQueryParams);
@@ -507,4 +509,11 @@ public function getHtml(): string
 
         return $renderer->toHtml();
     }
+
+    private function getCurrentRoute(): string
+    {
+        return ($this->request instanceof HttpRequest ? $this->request->getRouteName() : '') . '/' .
+            $this->request->getControllerName() . '/' .
+            $this->request->getActionName();
+    }
 }