Remove unused code and improve query performance in KerangkaAcuan and DaftarSp2d

Author: laravelwebdev

app/Nova/Actions/AddPerjalananDinas.php

@@ -2,6 +2,7 @@
 
 namespace App\Nova\Actions;
 
+use App\Helpers\Helper;
 use App\Models\PerjalananDinas;
 use Illuminate\Bus\Queueable;
 use Illuminate\Queue\InteractsWithQueue;
@@ -23,13 +24,14 @@ public function name()
     /**
      * Perform the action on the given models.
      *
-     * @param  \Laravel\Nova\Fields\ActionFields  $fields
-     * @param  \Illuminate\Support\Collection  $models
      * @return mixed
      */
     public function handle(ActionFields $fields, Collection $models)
     {
         $kak = $models->first();
+        if (! Helper::hasAkun($kak->id, Helper::$akun_perjalanan)) {
+            return ActionResponse::danger('Kerangka Acuan ini tidak  memiliki Akun Perjalanan Dinas');
+        }
         $perjalanan = new PerjalananDinas;
         $perjalanan->kerangka_acuan_id = $kak->id;
         $perjalanan->tanggal_berangkat = $kak->awal;
@@ -43,7 +45,6 @@ public function handle(ActionFields $fields, Collection $models)
     /**
      * Get the fields available on the action.
      *
-     * @param  \Laravel\Nova\Http\Requests\NovaRequest  $request
      * @return array
      */
     public function fields(NovaRequest $request)

app/Nova/DaftarSp2d.php

@@ -272,7 +272,7 @@ public function actions(NovaRequest $request)
 
     public static function indexQuery(NovaRequest $request, $query)
     {
-        $query->whereYear('tanggal_sp2d', session('year'))->withCount('kerangkaAcuan');
+        $query->whereYear('tanggal_sp2d', session('year'));
     }
 
     // BUG: tidak muncul d SPM 12

app/Nova/KerangkaAcuan.php

@@ -25,7 +25,6 @@
 use Laravel\Nova\Fields\Status;
 use Laravel\Nova\Fields\Text;
 use Laravel\Nova\Fields\Textarea;
-use Laravel\Nova\Http\Requests\ActionRequest;
 use Laravel\Nova\Http\Requests\NovaRequest;
 use Laravel\Nova\Panel;
 use Laravel\Nova\Query\Search\SearchableText;
@@ -42,7 +41,7 @@ public static function label()
 
     public static function indexQuery(NovaRequest $request, $query)
     {
-        $query->whereYear('tanggal', session('year'))->withCount('daftarSp2d');
+        $query->whereYear('tanggal', session('year'));
         if (Policy::make()->allowedFor('ppk,arsiparis,bendahara,kpa,ppspm')->get()) {
             return $query;
         } elseif (Policy::make()->allowedFor('koordinator,anggota')->get()) {
@@ -135,7 +134,7 @@ public function fields(NovaRequest $request)
                 ->filterable(function ($request, $query, $value, $attribute) {
                     $query->has('daftarSp2d', '<=', $value);
                 })
-                ->onlyOnDetail(),
+                ->onlyOnIndex(),
             BelongsToMany::make('SP2D', 'daftarSp2d', 'App\Nova\DaftarSp2d'),
             Tab::group('Detail', [
                 HasMany::make('Anggaran', 'anggaranKerangkaAcuan', 'App\Nova\AnggaranKerangkaAcuan'),
@@ -214,13 +213,6 @@ public function actions(NovaRequest $request)
            AddPerjalananDinas::make()
                ->onlyInline()
                ->confirmButtonText('Tambahkan')
-               ->canSee(function ($request) {
-                   if ($request instanceof ActionRequest) {
-                       return true;
-                   }
-
-                   return $this->resource instanceof Model && Helper::hasAkun($this->id, Helper::$akun_perjalanan);
-               })
                ->exceptOnIndex();
         }