Merge branch 'develop' into tag-children-add-multiple-entities

owlchester · Dec 5, 2023 · 0a5428f · 0a5428f
2 parents 47a1858 + 463e1b4
commit 0a5428f
Show file tree

Hide file tree

Showing 150 changed files with 880 additions and 5,052 deletions.
diff --git a/.gitignore b/.gitignore
@@ -24,4 +24,5 @@ yarn-error.log
 .phpunit.result.cache
 *.sql
 package-lock.json
+.phpstorm.meta.php
 
diff --git a/.phpstorm.meta.php b/.phpstorm.meta.php
diff --git a/app/Console/Commands/GenerateTrees.php b/app/Console/Commands/GenerateTrees.php
diff --git a/app/Console/Commands/InstallCommand.php b/app/Console/Commands/InstallCommand.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace App\Console\Commands;
+
+use App\Models\EntityType;
+use Illuminate\Console\Command;
+use Exception;
+
+class InstallCommand extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'kanka:install';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Set up Kanka\'s boilerplate';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle()
+    {
+        try {
+            if (EntityType::find(1)) {
+                $this->error('Kanka has already been installed.');
+                return;
+            }
+        } catch (Exception) {
+        }
+        $this->call('key:generate');
+        $this->call('migrate');
+        $this->call('db:seed');
+        $this->call('passport:install');
+
+        $this->info('Kanka successfully installed.');
+        $this->info('Check it out at ' . config('app.url'));
+    }
+}
diff --git a/app/Http/Controllers/Abilities/AbilityController.php b/app/Http/Controllers/Abilities/AbilityController.php
@@ -31,7 +31,6 @@ public function index(Campaign $campaign, Ability $ability)
         Datagrid::layout(\App\Renderers\Layouts\Ability\Ability::class)
             ->route('abilities.abilities', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $ability
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Abilities/EntityController.php b/app/Http/Controllers/Abilities/EntityController.php
@@ -65,8 +65,11 @@ public function store(StoreAbilityEntity $request, Campaign $campaign, Ability $
             $redirectUrlOptions['ability_id'] = $ability->id;
         }
 
-        $ability->attachEntity($request->only('entity_id', 'visibility_id'));
+        $count = $ability->attachEntity($request->only('entities', 'visibility_id'));
+
         return redirect()->route('abilities.entities', [$campaign, 'ability' => $ability->id])
-            ->with('success', __('abilities.children.create.success', ['name' => $ability->name]));
+            //->with('success', __('abilities.children.create.success', ['name' => $ability->name]));
+            ->with('success', trans_choice('abilities.children.create.attach_success', $count, ['count' => $count, 'name' => $ability->name]));
+
     }
 }
diff --git a/app/Http/Controllers/Api/v1/FilterApiController.php b/app/Http/Controllers/Api/v1/FilterApiController.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers\Api\v1;
+
+use App\Http\Controllers\Controller;
+use App\Models\EntityType;
+use App\Services\Api\FilterService;
+
+class FilterApiController extends Controller
+{
+    protected FilterService $filterService;
+
+    public function __construct(FilterService $filterService)
+    {
+        $this->filterService = $filterService;
+    }
+
+    public function index()
+    {
+        return response()->json($this->filterService->endpoints());
+    }
+    public function show(EntityType $entityType)
+    {
+        return response()->json([
+            'data' => $this->filterService
+                ->entityType($entityType)
+                ->filters()
+        ]);
+    }
+}
diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php
@@ -13,6 +13,7 @@
 use App\Models\Entity;
 use App\Models\AttributeTemplate;
 use App\Models\Bookmark;
+use App\Models\Family;
 use App\Models\MiscModel;
 use App\Sanitizers\MiscSanitizer;
 use App\Services\MultiEditingService;
@@ -118,9 +119,12 @@ public function crudIndex(Request $request)
         $model = new $this->model();
         $campaign = $this->campaign;
         $this->filterService
-            ->request($request)
-            ->model($model)
-            ->make($this->view);
+            ->request($request);
+        if (method_exists($model, 'explicitFilters')) {
+            $this->filterService
+                ->model($model)
+                ->make($this->view);
+        }
         $name = $this->view;
         $langKey = $this->langKey ?? $name;
         /** @var DatagridFilter|null $filter */
@@ -144,7 +148,7 @@ public function crudIndex(Request $request)
         $parent = null;
         if (request()->has('parent_id')) {
             // @phpstan-ignore-next-line
-            $parentKey = $model->getParentIdName();
+            $parentKey = $model->getParentKeyName();
             $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]);
 
             $parent = $model->where('id', request()->get('parent_id'))->first();
@@ -153,6 +157,7 @@ public function crudIndex(Request $request)
         // Do this to avoid an extra sql query when no filters are selected
         if ($this->filterService->hasFilters()) {
             $unfilteredCount = $base->count();
+            // @phpstan-ignore-next-line
             $base = $base->filter($this->filterService->filters());
 
             $models = $base->paginate();

diff --git a/app/Http/Controllers/Events/EventController.php b/app/Http/Controllers/Events/EventController.php
@@ -31,7 +31,6 @@ public function index(Campaign $campaign, Event $event)
         Datagrid::layout(\App\Renderers\Layouts\Event\Event::class)
             ->route('events.events', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $event
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Front/HelperController.php b/app/Http/Controllers/Front/HelperController.php
@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Front;
 
+use App\Models\Family;
 use App\Models\MiscModel;
 use Exception;
 use Illuminate\Support\Str;
@@ -29,6 +30,7 @@ public function apiFilters()
             if (!$misc instanceof MiscModel) {
                 abort(404);
             }
+            // @phpstan-ignore-next-line
             $filters = $misc->getFilterableColumns();
 
             return view('helpers.api-filters', compact(

diff --git a/app/Http/Controllers/Locations/CharacterController.php b/app/Http/Controllers/Locations/CharacterController.php
@@ -38,6 +38,7 @@ public function index(Campaign $campaign, Location $location)
                 'location', 'location.entity',
                 'races', 'families',
             ])
+            ->filter($filters)
             ->filteredCharacters()
             ->paginate();
 

diff --git a/app/Http/Controllers/Locations/LocationController.php b/app/Http/Controllers/Locations/LocationController.php
@@ -34,7 +34,7 @@ public function index(Campaign $campaign, Location $location)
         // @phpstan-ignore-next-line
         $this->rows = $location
             ->descendants()
-            ->select(['id', 'image', 'name', 'type', 'location_id', 'is_private'])
+            ->select(['id', 'name', 'type', 'location_id', 'is_private'])
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])
             ->filter($filters)
             ->with([

diff --git a/app/Http/Controllers/Organisation/OrganisationController.php b/app/Http/Controllers/Organisation/OrganisationController.php
@@ -32,7 +32,6 @@ public function organisations(Campaign $campaign, Organisation $organisation)
         Datagrid::layout(\App\Renderers\Layouts\Organisation\Organisation::class)
             ->route('organisations.organisations', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $organisation
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Quests/QuestController.php b/app/Http/Controllers/Quests/QuestController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Quest $quest)
         Datagrid::layout(\App\Renderers\Layouts\Quest\Quest::class)
             ->route('quests.quests', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $quest
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Races/RaceController.php b/app/Http/Controllers/Races/RaceController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Race $race)
         Datagrid::layout(\App\Renderers\Layouts\Race\Race::class)
             ->route('races.races', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $race
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Tags/TagController.php b/app/Http/Controllers/Tags/TagController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Tag $tag)
         Datagrid::layout(\App\Renderers\Layouts\Tag\Tag::class)
             ->route('tags.tags', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $tag
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Timelines/TimelineController.php b/app/Http/Controllers/Timelines/TimelineController.php
@@ -32,7 +32,6 @@ public function index(Campaign $campaign, Timeline $timeline)
         Datagrid::layout(\App\Renderers\Layouts\Timeline\Timeline::class)
             ->route('timelines.timelines', $options);
 
-        // @phpstan-ignore-next-line
         $this->rows = $timeline
             ->descendants()
             ->sort(request()->only(['o', 'k']), ['name' => 'asc'])

diff --git a/app/Http/Controllers/Timelines/TimelineReorderController.php b/app/Http/Controllers/Timelines/TimelineReorderController.php
@@ -6,6 +6,7 @@
 use App\Http\Requests\ReorderTimeline;
 use App\Models\Campaign;
 use App\Models\Timeline;
+use App\Models\TimelineEra;
 use App\Services\TimelineService;
 
 class TimelineReorderController extends Controller
@@ -31,6 +32,7 @@ public function index(Campaign $campaign, Timeline $timeline)
             ->get();
 
         $hasNothing = true;
+        /** @var TimelineEra $era */
         foreach ($eras as $era) {
             if (!$era->orderedElements->isEmpty()) {
                 $hasNothing = false;

diff --git a/app/Http/Requests/StoreAbilityEntity.php b/app/Http/Requests/StoreAbilityEntity.php
@@ -25,8 +25,9 @@ public function rules()
     {
         return [
             'ability_id' => 'required|exists:entities,id',
-            'entity_id' => 'required|exists:entities,id|different:ability_id',
             'visibility_id' => 'required|exists:visibilities,id',
+            'entities' => 'array|required',
+            'entities.*' => ['different:ability_id|exists:entities,id'],
         ];
     }
 }
diff --git a/app/Http/Resources/Entity.php b/app/Http/Resources/Entity.php
@@ -29,7 +29,7 @@ public function toArray($request)
             'id' => $model->child->id,
             'entity_id' => $model->id,
             'name' => $model->name,
-            'image' => Avatar::entity($model)->thumbnail(),
+            'image' => Avatar::entity($model)->original(),
             'image_thumb' => Avatar::entity($model)->size(40)->thumbnail(),
             'has_custom_image' => !empty($model->image_path) && !empty($model->image),
 

diff --git a/app/Http/Resources/EntityAssetResource.php b/app/Http/Resources/EntityAssetResource.php
@@ -17,7 +17,7 @@ public function toArray($request)
         /** @var EntityAsset $asset */
         $asset = $this->resource;
 
-        $data = $this->entity([
+        $data = $this->onEntity([
             'type_id' => $asset->type_id,
             '_file' => $asset->isFile(),
             '_link' => $asset->isLink(),

diff --git a/app/Http/Resources/EntityResource.php b/app/Http/Resources/EntityResource.php
@@ -205,7 +205,7 @@ public function entity(array $prepared = [])
 
             if ($misc->ancestors) {
                 $ancestors = [];
-                foreach ($misc->getAncestors(['id']) as $ancestor) {
+                foreach ($misc->ancestors as $ancestor) {
                     $ancestors[] = $ancestor->id;
                 }
                 $merged['parents'] = $ancestors;

diff --git a/app/Http/Resources/InventoryResource.php b/app/Http/Resources/InventoryResource.php
@@ -16,7 +16,7 @@ public function toArray($request)
     {
         /** @var Inventory $model */
         $model = $this->resource;
-        return $this->entity([
+        return $this->onEntity([
             'item_id' => $model->item_id,
             'name' => $model->name,
             'position' => $model->position,

diff --git a/app/Http/Resources/PostResource.php b/app/Http/Resources/PostResource.php
@@ -16,7 +16,7 @@ public function toArray($request)
     {
         /** @var Post $model */
         $model = $this->resource;
-        return $this->entity([
+        return $this->onEntity([
             'name' => $model->name,
             'visibility_id' => (int) $model->visibility_id->value,
             'entry' => $model->entry,