BREAKING CHANGE / refactor(controller): Controllers refactored / close …

…#81

CHANGELOG.md

@@ -5,12 +5,32 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.3.7.2] - 2022-02-21
+
+- BREAKING CHANGES:
+    - [x] [1.3.7.1]
+
+### Changed
+
+- Controllers refactored
+
 ## [1.3.7.1] - 2022-02-19
 
 ### Added
 
 - Implemented cache for controllers
 - Added facades por ```PbDebugbar``` class
+- Added ```PbCacheController```
+
+### Changed
+
+- 'Permissions' and 'Navigations' seeders updated
+
+### Fixed
+
+- Fixed errors in ```Loggers``` CRUD
+- Fixed 'module' fields in forms
+- Fixed 'settings' menu button
 
 ## [1.3.7] - 2022-02-14
 

composer.json

@@ -11,7 +11,7 @@
     ],
     "homepage": "https://anibalalvarez.com",
     "license": "MIT",
-    "version" : "1.3.7.1",
+    "version" : "1.3.7.2",
     "type" : "package",
     "authors": [
         {

src/Controllers/Config/PbCacheController.php

@@ -5,11 +5,13 @@
 use Anibalealvarezs\Projectbuilder\Models\PbCurrentUser;
 use Anibalealvarezs\Projectbuilder\Traits\PbControllerTrait;
 use Anibalealvarezs\Projectbuilder\Utilities\PbCache;
-use Exception;
+
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Artisan;
 
+use Exception;
+
 class PbCacheController
 {
     use PbControllerTrait;

src/Controllers/Config/PbConfigController.php

@@ -15,11 +15,10 @@
 
 use Auth;
 use DB;
-use Inertia\Response as InertiaResponse;
-use Psr\SimpleCache\InvalidArgumentException;
-use ReflectionException;
 use Session;
 
+use Inertia\Response as InertiaResponse;
+
 class PbConfigController extends PbBuilderController
 {
     function __construct(Request $request, $crud_perms = false)
@@ -44,7 +43,7 @@ function __construct(Request $request, $crud_perms = false)
      *
      * @param string $route
      * @return InertiaResponse|JsonResponse
-     * @throws ReflectionException|InvalidArgumentException
+     * @throws \ReflectionException
      */
     public function create(string $route = 'level'): InertiaResponse|JsonResponse
     {
@@ -58,7 +57,6 @@ public function create(string $route = 'level'): InertiaResponse|JsonResponse
      *
      * @param Request $request
      * @return Application|Redirector|RedirectResponse|null
-     * @throws ReflectionException
      */
     public function store(Request $request): Redirector|RedirectResponse|Application|null
     {
@@ -75,7 +73,7 @@ public function store(Request $request): Redirector|RedirectResponse|Application
      * @param bool $multiple
      * @param string $route
      * @return RedirectResponse|InertiaResponse|JsonResponse
-     * @throws ReflectionException|InvalidArgumentException
+     * @throws \ReflectionException
      */
     public function edit(
         int $id,
@@ -95,7 +93,6 @@ public function edit(
      * @param Request $request
      * @param int $id
      * @return Application|Redirector|RedirectResponse|null
-     * @throws ReflectionException
      */
     public function update(Request $request, int $id): Redirector|RedirectResponse|Application|null
     {

src/Controllers/Config/PbLocaleController.php

@@ -4,7 +4,9 @@
 
 use Anibalealvarezs\Projectbuilder\Models\PbLanguage;
 use Anibalealvarezs\Projectbuilder\Traits\PbControllerTrait;
+
 use App\Http\Controllers\Controller;
+
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 

src/Controllers/Dashboard/PbDashboardController.php

@@ -6,11 +6,12 @@
 
 use App\Http\Requests;
 
-use Auth;
-use DB;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+
+use Auth;
+use DB;
 use Session;
 
 use Inertia\Response as InertiaResponse;

src/Controllers/Logger/PbLoggerController.php

@@ -3,7 +3,9 @@
 namespace Anibalealvarezs\Projectbuilder\Controllers\Logger;
 
 use Anibalealvarezs\Projectbuilder\Controllers\PbBuilderController;
+
 use App\Http\Requests;
+
 use Illuminate\Http\Request;
 
 class PbLoggerController extends PbBuilderController

src/Controllers/Navigation/PbNavigationController.php

@@ -4,8 +4,6 @@
 
 use Anibalealvarezs\Projectbuilder\Controllers\PbBuilderController;
 
-use Anibalealvarezs\Projectbuilder\Facades\PbDebugbarFacade as Debug;
-use Anibalealvarezs\Projectbuilder\Utilities\PbCache;
 use App\Http\Requests;
 
 use Illuminate\Http\JsonResponse;
@@ -15,11 +13,10 @@
 
 use Auth;
 use DB;
-use Inertia\Response as InertiaResponse;
-use Psr\SimpleCache\InvalidArgumentException;
-use ReflectionException;
 use Session;
 
+use Inertia\Response as InertiaResponse;
+
 class PbNavigationController extends PbBuilderController
 {
     function __construct(Request $request, $crud_perms = false)
@@ -62,7 +59,7 @@ function __construct(Request $request, $crud_perms = false)
      * @param bool $multiple
      * @param string $route
      * @return InertiaResponse|JsonResponse|RedirectResponse
-     * @throws ReflectionException|InvalidArgumentException
+     * @throws \ReflectionException
      */
     public function index(
         int $page = 1,
@@ -74,33 +71,25 @@ public function index(
         bool $multiple = false,
         string $route = 'level'): InertiaResponse|JsonResponse|RedirectResponse
     {
-        Debug::start('custom_controller', $this->vars->level->names.' crud controller');
+        $this->startController(getClassName(__CLASS__));
 
-        Debug::measure(
-            $this->vars->level->names.' crud controller - model list build',
-            function() use (&$model, $page, $perpage, $orderby, $field, $order) {
-                $cached = PbCache::run(
-                    closure: fn() =>  $this->vars->level->modelPath::withPublicRelations()->orderedByDefault()->get(),
-                    package: $this->vars->helper->package,
-                    class: 'model_controller',
-                    model: $this->vars->level->names,
-                    modelFunction: 'getList',
-                    byRoles: true,
-                );
-                $model = $cached['data'];
-                $this->vars->cacheObjects[$cached['tags']][] = $cached['keys'];
-            }
-        );
+        // Set cache/methods arguments
+        $this->initArgs([
+            'class' => 'model_controller',
+            'pagination' => ['page' => $page, 'perpage' => $perpage, 'orderby' => $orderby, 'field' => $field, 'order' => $order],
+            'byRoles' => true,
+        ]);
+
+        // Get models list
+        $this->measuredRun(return: $model, name: getClassName(__CLASS__) . ' - models list build', args: [
+            'closure' => fn() => $this->vars->level->modelPath::withPublicRelations()->orderedByDefault()->get(),
+            'modelFunction' => 'getList',
+        ]);
 
-        Debug::stop('custom_controller');
+        $this->stopController(getClassName(__CLASS__));
 
         return parent::index(
-            $page,
-            $perpage,
-            $orderby,
-            $field,
-            $order,
-            $model
+            element: $model,
         );
     }
 }