wip

Author: iamgergo

resources/views/dashboard.blade.php

@@ -1,7 +1,7 @@
 @extends('root::app')
 
 {{-- Title --}}
-@section('title', 'Dashboard')
+@section('title', __('Dashboard'))
 
 {{-- Content --}}
 @section('content')

src/Resources/Resource.php

@@ -29,6 +29,8 @@
 use Cone\Root\Traits\ResolvesFilters;
 use Cone\Root\Traits\ResolvesWidgets;
 use Cone\Root\Traits\Translatable;
+use Cone\Root\Widgets\Metric;
+use Cone\Root\Widgets\Widget;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Contracts\Support\MessageBag;
@@ -422,6 +424,16 @@ protected function resolveAction(Request $request, Action $action): void
         $action->withQuery(fn (): Builder => $this->resolveFilteredQuery($request));
     }
 
+    /**
+     * Handle the callback for the widget resolution.
+     */
+    protected function resolveWidget(Request $request, Widget $widget): void
+    {
+        if ($widget instanceof Metric) {
+            $widget->withQuery(fn (): Builder => $this->resolveQuery($request));
+        }
+    }
+
     /**
      * Get the per page options.
      */

src/Widgets/Metric.php

@@ -3,6 +3,7 @@
 namespace Cone\Root\Widgets;
 
 use Closure;
+use Cone\Root\Exceptions\QueryResolutionException;
 use DateInterval;
 use DatePeriod;
 use DateTime;
@@ -27,23 +28,16 @@ abstract class Metric extends Widget
      */
     protected ?Closure $queryResolver = null;
 
-    /**
-     * Create a new Eloquent query.
-     */
-    abstract public function query(): Builder;
-
     /**
      * Resolve the query.
      */
     public function resolveQuery(Request $request): Builder
     {
-        $query = $this->query();
-
-        if (! is_null($this->queryResolver)) {
-            call_user_func_array($this->queryResolver, [$request, $query]);
+        if (is_null($this->queryResolver)) {
+            throw new QueryResolutionException;
         }
 
-        return $query;
+        return call_user_func_array($this->queryResolver, [$request]);
     }
 
     /**

stubs/Trend.stub

@@ -3,6 +3,7 @@
 namespace {{ namespace }};
 
 use Cone\Root\Widgets\Trend;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 
 class {{ class }} extends Trend

stubs/Value.stub

@@ -3,6 +3,7 @@
 namespace {{ namespace }};
 
 use Cone\Root\Widgets\Value;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Http\Request;
 
 class {{ class }} extends Value