From 2d7359b650671cde8249e5c0e9a64bb1a810ef8a Mon Sep 17 00:00:00 2001
From: Tony Air <tony@twma.pro>
Date: Fri, 2 Feb 2024 18:21:05 +0200
Subject: [PATCH] IMPR: AJAX processing

---
 app/src/Pages/PageController.php | 56 +++-----------------------------
 1 file changed, 5 insertions(+), 51 deletions(-)

diff --git a/app/src/Pages/PageController.php b/app/src/Pages/PageController.php
index 522681f..c9e7a68 100644
--- a/app/src/Pages/PageController.php
+++ b/app/src/Pages/PageController.php
@@ -3,6 +3,8 @@
 // vendor/silverstripe/errorpage/src/ErrorPageController.php
 // extends global PageController class
 //namespace App\Pages;
+
+use A2nt\CMSNiceties\Ajax\Ex\AjaxControllerEx;
 use SilverStripe\CMS\Controllers\ContentController;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Control\Controller;
@@ -16,6 +18,8 @@ use SilverStripe\View\SSViewer;
  * @method \Page data()
  * @mixin \Page
  * @mixin \A2nt\CMSNiceties\Extensions\PageControllerEx
+ * @mixin \A2nt\CMSNiceties\Ajax\Ex\AjaxLoginFormControllerEx
+ * @mixin \App\Service\Ex\ServiceSignUpControllerEx
  */
 class PageController extends ContentController
 {
@@ -56,38 +60,12 @@ class PageController extends ContentController
 
         // inject AJAX processing
         if (Director::is_ajax()) {
-            return self::processAJAX($tpls);
+            return AjaxControllerEx::processAJAX($tpls);
         }
 
         return SSViewer::create($tpls);
     }
 
-    protected static function processAJAX($tpls)
-    {
-        foreach ($tpls as $tpl) {
-            if (is_array($tpl)) {
-                continue;
-            }
-
-            $a_tpl = explode('\\', $tpl);
-            $last_name = array_pop($a_tpl);
-            $a_tpl[] = 'Layout';
-            $a_tpl[] = $last_name;
-            $a_tpl = implode('\\', $a_tpl);
-
-            if (SSViewer::hasTemplate($a_tpl)) {
-                $tpl = $a_tpl;
-                break;
-            }
-        }
-        //
-
-        $tpl = is_array($tpl) ? 'Page' : $tpl;
-        $tpl = ($tpl !== 'Page') ? $tpl : 'Layout/Page';
-
-        return SSViewer::create($tpl);
-    }
-
     protected function prepareResponse($response)
     {
         parent::prepareResponse($response);
@@ -98,28 +76,4 @@ class PageController extends ContentController
             $this->prepareAjaxResponse($response);
         }
     }
-
-    protected function prepareAjaxResponse($response)
-    {
-        $record = $this->dataRecord;
-
-        $req = $this->getRequest();
-        $url = $req->getURL();
-        $url = $url === 'home' ? '/' : $url;
-
-        $resources = array_merge(
-            $this->config()->get('graphql_resources'),
-            $this->config()->get('ajax_resources')
-        );
-
-        $response->setBody(json_encode([
-            'ID' => $record->ID,
-            'Title' => $record->Title,
-            'Link' => $this->Link(),
-            'CSSClass' => $this->CSSClass(),
-            'Resources' => $resources,
-            'RequestLink' => $url,
-            'MainContent' => $response->getBody(),
-        ]));
-    }
 }