FEATURE #2042: refactorize widgets

app/CMS/Helpers/WidgetAreas.php

@@ -1,6 +1,8 @@
 <?php
+
 namespace App\CMS\Helpers;
 
+use App\CMS\Repositories\Widgets\WidgetArea as WidgetAreaRepository;
 use App\Models\Widgets\WidgetArea;
 use Illuminate\Support\Facades\Cache;
 
@@ -25,15 +27,16 @@ class WidgetAreas
 
     protected static function loadWidgetArea($uniqueCode)
     {
-        $widgets = Cache::remember('widget-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
+        dd($uniqueCode);
+        WidgetArea::where('code', $uniqueCode)
+                  ->increment('viewed');
+
+        $widgets = Cache::remember('widget-area-' . $uniqueCode, setting('widgetCacheLifetime', 5), function () use ($uniqueCode) {
             $widgetArea = new WidgetArea();
             return $widgetArea->getWidgets($uniqueCode)
                               ->get();
         });
 
-        WidgetArea::where('code', $uniqueCode)
-                  ->increment('viewed');
-
         self::saveRenderedWidgetArea($widgets);
     }
 
@@ -44,7 +47,7 @@ class WidgetAreas
         }
 
         $widgets = Cache::remember('widgets', setting('widgetCacheLifetime', 5), function () {
-            $widgetArea = new WidgetArea();
+            $widgetArea = app(WidgetAreaRepository::class);
             return $widgetArea->getWidgets()
                               ->get();
         });
@@ -58,7 +61,7 @@ class WidgetAreas
      *
      * @param $uniqueCode
      *
-     * @return mixed
+     * @return void
      */
     public static function render($uniqueCode)
     {

app/CMS/Repositories/Widgets/Widget.php

@@ -1,4 +1,5 @@
 <?php
+
 namespace App\CMS\Repositories\Widgets;
 
 use App\Http\Requests\Request;
@@ -20,7 +21,7 @@ class Widget
         $widget->description = $data['description'];
         $widget->container_class = $data['containerClass'];
         $widget->container_id = empty($data['containerId']) ? null : $data['containerId'];
-        $widget->settings = json_encode(call_user_func([$widgetType->handler, 'save'], $request));
+        $widget->settings = call_user_func([$widgetType->handler, 'save'], $request);
 
         // save into database
         $widget->save();
@@ -30,4 +31,22 @@ class Widget
 
         return $widget;
     }
+
+    public function edit(WidgetModel $widget, Request $request)
+    {
+        // update name
+        $widget->name = $request->name;
+        $widget->container_class = $request->containerClass;
+        $widget->container_id = empty($request->containerId) ? null : $request->containerId;
+        $widget->description = $request->description;
+
+        // try to save this widget
+        $widget->settings = call_user_func([$widget->widget_type_handler, 'save'], $request);
+
+        // save into database
+        $widget->save();
+
+        // fire event with editing widget
+        Event::fire(new \App\Events\EditWidget($widget));
+    }
 }

app/CMS/Repositories/Widgets/WidgetArea.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace App\CMS\Repositories\Widgets;
+
+use App\Events\CreateNewWidgetArea;
+use App\Http\Requests\Request;
+use App\Models\Widgets\Widget;
+use App\Models\Widgets\WidgetArea as WidgetAreaModel;
+use Illuminate\Support\Facades\Event;
+use Mcamara\LaravelLocalization\Facades\LaravelLocalization;
+
+class WidgetArea
+{
+    public function getWidgets($uniqueCode = false)
+    {
+        $widgets = Widget::select('widgets.*', 'widgets.widget_type_handler', 'widget_areas.code as widget_area_code', 'widgets.name as widget_name', 'widgets.settings')
+                         ->join('widget_in_widget_area', 'widget_in_widget_area.widget_id', '=', 'widgets.id')
+                         ->join('widget_areas', 'widget_in_widget_area.widget_area_id', '=', 'widget_areas.id')
+                         ->where('language', LaravelLocalization::getCurrentLocale())
+                         ->orderBy('widget_in_widget_area.position');
+        if (!$uniqueCode) {
+            $widgets = $widgets->where('widget_areas.viewed', '>=', setting('preloadFrequentedWidgetAreasTreshold', 10));
+        } else {
+            $widgets = $widgets->where('code', $uniqueCode);
+        }
+
+        return $widgets;
+    }
+
+    public function update(\App\Models\Widgets\WidgetArea $area, Request $request) {
+        $area->name = $request->name;
+        $area->description = $request->description;
+        $area->save();
+
+        // fire event with new widget area
+        Event::fire(new \App\Events\EditWidgetArea($area));
+    }
+
+    /**
+     * Create new instance of widget area
+     *
+     * @param Request $request
+     */
+    public function create(Request $request)
+    {
+        $area = WidgetAreaModel::create([
+                                            'code'        => $request->code,
+                                            'name'        => $request->name,
+                                            'description' => $request->description
+                                        ]);
+
+        // fire event with new widget area
+        Event::fire(new CreateNewWidgetArea($area));
+    }
+}

app/CMS/Widgets/Menu/Presenters/Menu.php

@@ -84,13 +84,12 @@ class Menu implements WidgetRenderer
         // get list of all pages
         $pages = $content->getOverview()
                          ->get();
-        $widget->settings = new \stdClass();
-        $widget->settings->links = [];
 
         return view('admin.widgets.menu.new', [
             'type'   => $type,
             'widget' => $widget,
             'pages'  => $pages,
+            'links'  => []
         ]);
     }
 
@@ -124,8 +123,6 @@ class Menu implements WidgetRenderer
             return $a->order - $b->order;
         });
 
-        $widget->settings->links = (object)$links;
-
-        return view('admin.widgets.menu.edit', ['widget' => $widget, 'pages' => $pages]);
+        return view('admin.widgets.menu.edit', ['widget' => $widget, 'pages' => $pages, 'links' => (object)$links]);
     }
 }