Pass model to controller and call handleRequest

HansSchouten · Dec 16, 2019 · 40af56c · 40af56c
1 parent 6eeab1d
commit 40af56c
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 17 deletions.
diff --git a/src/Modules/GrapesJS/Block/BaseController.php b/src/Modules/GrapesJS/Block/BaseController.php
@@ -4,8 +4,32 @@
 
 class BaseController
 {
+    /**
+     * @var BaseModel $model
+     */
+    protected $model;
 
-    public function index()
+    /**
+     * @var bool $forPageBuilder
+     */
+    protected $forPageBuilder;
+
+    /**
+     * Pass essential data to this Block model instance.
+     *
+     * @param BaseModel $model
+     * @param bool $forPageBuilder
+     */
+    public function init(BaseModel $model, $forPageBuilder = false)
+    {
+        $this->model = $model;
+        $this->forPageBuilder = $forPageBuilder;
+    }
+
+    /**
+     * Handle the current request.
+     */
+    public function handleRequest()
     {
     }
 

diff --git a/src/Modules/GrapesJS/Block/BaseModel.php b/src/Modules/GrapesJS/Block/BaseModel.php
@@ -17,22 +17,22 @@ class BaseModel
     protected $data;
 
     /**
-     * @var bool $editMode
+     * @var bool $forPageBuilder
      */
-    protected $editMode;
+    protected $forPageBuilder;
 
     /**
      * Pass essential data to this Block model instance.
      *
      * @param ThemeBlock $block
      * @param array $data
-     * @param bool $editMode
+     * @param bool $forPageBuilder
      */
-    public function init(ThemeBlock $block, $data = [], $editMode = false)
+    public function init(ThemeBlock $block, $data = [], $forPageBuilder = false)
     {
         $this->block = $block;
         $this->data = is_array($data) ? $data : [];
-        $this->editMode = $editMode;
+        $this->forPageBuilder = $forPageBuilder;
     }
 
     /**

diff --git a/src/Modules/GrapesJS/Block/BlockRenderer.php b/src/Modules/GrapesJS/Block/BlockRenderer.php
@@ -72,25 +72,27 @@ protected function renderHtmlBlock(ThemeBlock $themeBlock, $blockData)
     protected function renderDynamicBlock(ThemeBlock $themeBlock, $blockData)
     {
         $controller = new BaseController;
-        $block = new BaseModel;
-
-        if ($themeBlock->getControllerClass()) {
-            require_once $themeBlock->getControllerFile();
-            $controllerClass = $themeBlock->getControllerClass();
-            $controller = new $controllerClass;
-        }
-        $controller->index();
+        $model = new BaseModel;
+        $blockData = $blockData ?? [];
 
         if ($themeBlock->getModelFile()) {
             require_once $themeBlock->getModelFile();
             $modelClass = $themeBlock->getModelClass();
-            $block = new $modelClass;
+            $model = new $modelClass;
         }
-        $blockData = $blockData ?? [];
-        $block->init($themeBlock, $blockData, $this->forPageBuilder);
+        $model->init($themeBlock, $blockData, $this->forPageBuilder);
+
+        if ($themeBlock->getControllerFile()) {
+            require_once $themeBlock->getControllerFile();
+            $controllerClass = $themeBlock->getControllerClass();
+            $controller = new $controllerClass;
+        }
+        $controller->init($model, $this->forPageBuilder);
+        $controller->handleRequest();
 
         // init additional variables that should be accessible in the view
         $page = $this->page;
+        $block = $model;
 
         ob_start();
         require $themeBlock->getViewFile();