From 1250e42992088d45c181227cce54ff8e0418eb58 Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 11:37:00 -0600 Subject: [PATCH 1/8] Remove old grid/table urls, merging them into one and saving last click --- .../Controllers/Crud/AbilityController.php | 8 -- .../Controllers/Crud/CalendarController.php | 8 -- .../Controllers/Crud/CharacterController.php | 15 -- .../Controllers/Crud/CreatureController.php | 7 - app/Http/Controllers/Crud/EventController.php | 7 - .../Controllers/Crud/FamilyController.php | 9 -- app/Http/Controllers/Crud/ItemController.php | 7 - .../Controllers/Crud/JournalController.php | 10 -- .../Controllers/Crud/LocationController.php | 7 - app/Http/Controllers/Crud/NoteController.php | 7 - .../Crud/OrganisationController.php | 7 - app/Http/Controllers/Crud/QuestController.php | 7 - app/Http/Controllers/Crud/RaceController.php | 7 - app/Http/Controllers/Crud/TagController.php | 7 - .../Controllers/Crud/TimelineController.php | 6 - app/Http/Controllers/CrudController.php | 129 ++++++++++++++---- app/Models/Bookmark.php | 8 +- app/Models/Relations/CampaignRelations.php | 2 +- app/Renderers/DatagridRenderer.php | 1 - app/Services/BreadcrumbService.php | 7 +- app/Services/RecoveryService.php | 2 +- app/Services/SidebarService.php | 15 -- app/Traits/TreeControllerTrait.php | 7 +- lang/en/abilities.php | 3 - lang/en/bookmarks.php | 1 - lang/en/calendars.php | 1 - lang/en/campaigns.php | 6 - lang/en/creatures.php | 3 - lang/en/datagrids.php | 2 + lang/en/events.php | 1 - lang/en/families.php | 4 - lang/en/items.php | 3 - lang/en/journals.php | 4 - lang/en/locations.php | 2 - lang/en/maps.php | 2 - lang/en/notes.php | 3 - lang/en/organisations.php | 4 - lang/en/quests.php | 1 - lang/en/races.php | 3 - lang/en/settings/appearance.php | 6 - lang/en/tags.php | 1 - lang/en/timelines.php | 1 - phpstan.neon | 2 +- resources/views/abilities/_tree.blade.php | 2 +- .../views/bookmarks/form/_entry.blade.php | 73 +++++----- .../views/bookmarks/form/_type.blade.php | 12 +- resources/views/calendars/_tree.blade.php | 2 +- .../views/campaigns/forms/panes/ui.blade.php | 6 - resources/views/creatures/_tree.blade.php | 2 +- .../views/cruds/datagrids/_grid.blade.php | 2 +- .../views/cruds/datagrids/explore.blade.php | 2 +- resources/views/cruds/tree.blade.php | 4 +- .../entities/components/header.blade.php | 2 +- .../components/profile/_type.blade.php | 2 +- .../pages/print/profile/_type.blade.php | 2 +- resources/views/events/_tree.blade.php | 2 +- resources/views/families/_tree.blade.php | 2 +- resources/views/items/_tree.blade.php | 2 +- resources/views/journals/_tree.blade.php | 2 +- .../layouts/datagrid/_togglers.blade.php | 26 +++- .../views/layouts/sidebars/app.blade.php | 14 +- resources/views/locations/_tree.blade.php | 2 +- resources/views/maps/_tree.blade.php | 2 +- resources/views/notes/_tree.blade.php | 2 +- resources/views/organisations/_tree.blade.php | 2 +- resources/views/quests/_tree.blade.php | 2 +- resources/views/races/_tree.blade.php | 2 +- resources/views/settings/appearance.blade.php | 21 --- resources/views/tags/_tree.blade.php | 2 +- resources/views/timelines/_tree.blade.php | 2 +- routes/campaigns/entities.php | 16 --- 71 files changed, 204 insertions(+), 351 deletions(-) diff --git a/app/Http/Controllers/Crud/AbilityController.php b/app/Http/Controllers/Crud/AbilityController.php index ea0280bb78..6191973170 100644 --- a/app/Http/Controllers/Crud/AbilityController.php +++ b/app/Http/Controllers/Crud/AbilityController.php @@ -7,21 +7,13 @@ use App\Http\Requests\StoreAbility; use App\Models\Ability; use App\Models\Campaign; -use App\Traits\TreeControllerTrait; class AbilityController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'abilities'; protected string $route = 'abilities'; protected string $module = 'abilities'; - /** - * Crud models - */ protected $model = Ability::class; protected string $filter = AbilityFilter::class; diff --git a/app/Http/Controllers/Crud/CalendarController.php b/app/Http/Controllers/Crud/CalendarController.php index 181a4f4ba8..1a5fa93aa1 100644 --- a/app/Http/Controllers/Crud/CalendarController.php +++ b/app/Http/Controllers/Crud/CalendarController.php @@ -8,23 +8,15 @@ use App\Models\Calendar; use App\Models\Campaign; use App\Sanitizers\CalendarSanitizer; -use App\Traits\TreeControllerTrait; class CalendarController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'calendars'; protected string $route = 'calendars'; protected $module = 'calendars'; - - /** @var string */ protected $model = Calendar::class; - /** */ protected string $filter = CalendarFilter::class; protected string $sanitizer = CalendarSanitizer::class; diff --git a/app/Http/Controllers/Crud/CharacterController.php b/app/Http/Controllers/Crud/CharacterController.php index 3ff5fcf4e0..921ff8ebed 100644 --- a/app/Http/Controllers/Crud/CharacterController.php +++ b/app/Http/Controllers/Crud/CharacterController.php @@ -10,19 +10,12 @@ class CharacterController extends CrudController { - /** - */ protected string $view = 'characters'; protected string $route = 'characters'; protected $module = 'characters'; - /** - * @var string - */ protected $model = Character::class; - /** - */ protected string $filter = CharacterFilter::class; public function store(StoreCharacter $request, Campaign $campaign) @@ -30,29 +23,21 @@ public function store(StoreCharacter $request, Campaign $campaign) return $this->campaign($campaign)->crudStore($request); } - /** - */ public function show(Campaign $campaign, Character $character) { return $this->campaign($campaign)->crudShow($character); } - /** - */ public function edit(Campaign $campaign, Character $character) { return $this->campaign($campaign)->crudEdit($character); } - /** - */ public function update(StoreCharacter $request, Campaign $campaign, Character $character) { return $this->campaign($campaign)->crudUpdate($request, $character); } - /** - */ public function destroy(Campaign $campaign, Character $character) { return $this->campaign($campaign)->crudDestroy($character); diff --git a/app/Http/Controllers/Crud/CreatureController.php b/app/Http/Controllers/Crud/CreatureController.php index c0052668ae..631a95a06b 100644 --- a/app/Http/Controllers/Crud/CreatureController.php +++ b/app/Http/Controllers/Crud/CreatureController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreCreature; use App\Models\Campaign; use App\Models\Creature; -use App\Traits\TreeControllerTrait; class CreatureController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'creatures'; protected string $route = 'creatures'; protected $module = 'creatures'; - /** @var string Model */ protected $model = Creature::class; - /** @var string Filter */ protected string $filter = CreatureFilter::class; /** diff --git a/app/Http/Controllers/Crud/EventController.php b/app/Http/Controllers/Crud/EventController.php index 08c271b73c..08d699f8e3 100644 --- a/app/Http/Controllers/Crud/EventController.php +++ b/app/Http/Controllers/Crud/EventController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreEvent; use App\Models\Campaign; use App\Models\Event; -use App\Traits\TreeControllerTrait; class EventController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'events'; protected string $route = 'events'; protected $module = 'events'; - /** @var string Model */ protected $model = Event::class; - /** @var string Filter */ protected string $filter = EventFilter::class; public function store(StoreEvent $request, Campaign $campaign) diff --git a/app/Http/Controllers/Crud/FamilyController.php b/app/Http/Controllers/Crud/FamilyController.php index 5a0f88e3d6..6c86888aca 100644 --- a/app/Http/Controllers/Crud/FamilyController.php +++ b/app/Http/Controllers/Crud/FamilyController.php @@ -7,24 +7,15 @@ use App\Http\Requests\StoreFamily; use App\Models\Campaign; use App\Models\Family; -use App\Traits\TreeControllerTrait; class FamilyController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'families'; protected string $route = 'families'; protected $module = 'families'; - /** - * Crud models - */ protected $model = Family::class; - /** @var string Filter */ protected string $filter = FamilyFilter::class; public function store(StoreFamily $request, Campaign $campaign) diff --git a/app/Http/Controllers/Crud/ItemController.php b/app/Http/Controllers/Crud/ItemController.php index 9da7977ae6..e156c40311 100644 --- a/app/Http/Controllers/Crud/ItemController.php +++ b/app/Http/Controllers/Crud/ItemController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreItem; use App\Models\Campaign; use App\Models\Item; -use App\Traits\TreeControllerTrait; class ItemController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'items'; protected string $route = 'items'; protected $module = 'items'; - /** @var string Model */ protected $model = Item::class; - /** @var string Filter */ protected string $filter = ItemFilter::class; /** diff --git a/app/Http/Controllers/Crud/JournalController.php b/app/Http/Controllers/Crud/JournalController.php index b0401c5ea1..c5fce9531f 100644 --- a/app/Http/Controllers/Crud/JournalController.php +++ b/app/Http/Controllers/Crud/JournalController.php @@ -7,25 +7,15 @@ use App\Http\Requests\StoreJournal; use App\Models\Campaign; use App\Models\Journal; -use App\Traits\TreeControllerTrait; class JournalController extends CrudController { - /** - * Tree / Nested Mode - */ - use TreeControllerTrait; - - /** - */ protected string $view = 'journals'; protected string $route = 'journals'; protected $module = 'journals'; - /** @var string Model*/ protected $model = Journal::class; - /** @var string Filter */ protected string $filter = JournalFilter::class; /** diff --git a/app/Http/Controllers/Crud/LocationController.php b/app/Http/Controllers/Crud/LocationController.php index 1ed15c598a..8f440993b5 100644 --- a/app/Http/Controllers/Crud/LocationController.php +++ b/app/Http/Controllers/Crud/LocationController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreLocation; use App\Models\Campaign; use App\Models\Location; -use App\Traits\TreeControllerTrait; class LocationController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'locations'; protected string $route = 'locations'; protected $module = 'locations'; - /** @var string Model */ protected $model = Location::class; - /** @var string Filter */ protected string $filter = LocationFilter::class; /** diff --git a/app/Http/Controllers/Crud/NoteController.php b/app/Http/Controllers/Crud/NoteController.php index 69c7870a7b..a1d33b24fc 100644 --- a/app/Http/Controllers/Crud/NoteController.php +++ b/app/Http/Controllers/Crud/NoteController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreNote; use App\Models\Campaign; use App\Models\Note; -use App\Traits\TreeControllerTrait; class NoteController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'notes'; protected string $route = 'notes'; protected $module = 'notes'; - /** @var string */ protected $model = Note::class; - /** @var string Filter */ protected string $filter = NoteFilter::class; /** diff --git a/app/Http/Controllers/Crud/OrganisationController.php b/app/Http/Controllers/Crud/OrganisationController.php index 95f4be2363..7292de528e 100644 --- a/app/Http/Controllers/Crud/OrganisationController.php +++ b/app/Http/Controllers/Crud/OrganisationController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreOrganisation; use App\Models\Campaign; use App\Models\Organisation; -use App\Traits\TreeControllerTrait; class OrganisationController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'organisations'; protected string $route = 'organisations'; protected $module = 'organisations'; - /** @var string */ protected $model = Organisation::class; - /** @var string Filter */ protected string $filter = OrganisationFilter::class; /** diff --git a/app/Http/Controllers/Crud/QuestController.php b/app/Http/Controllers/Crud/QuestController.php index 6d11af3ce1..2fe96335c9 100644 --- a/app/Http/Controllers/Crud/QuestController.php +++ b/app/Http/Controllers/Crud/QuestController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreQuest; use App\Models\Campaign; use App\Models\Quest; -use App\Traits\TreeControllerTrait; class QuestController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'quests'; protected string $route = 'quests'; protected $module = 'quests'; - /** @var string Model */ protected $model = Quest::class; - /** @var string Filter */ protected string $filter = QuestFilter::class; /** diff --git a/app/Http/Controllers/Crud/RaceController.php b/app/Http/Controllers/Crud/RaceController.php index b21e74fbf6..09072ea108 100644 --- a/app/Http/Controllers/Crud/RaceController.php +++ b/app/Http/Controllers/Crud/RaceController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreRace; use App\Models\Campaign; use App\Models\Race; -use App\Traits\TreeControllerTrait; class RaceController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'races'; protected string $route = 'races'; protected $module = 'races'; - /** @var string Model */ protected $model = Race::class; - /** @var string Filter */ protected string $filter = RaceFilter::class; /** diff --git a/app/Http/Controllers/Crud/TagController.php b/app/Http/Controllers/Crud/TagController.php index eac2be2921..399e13f87c 100644 --- a/app/Http/Controllers/Crud/TagController.php +++ b/app/Http/Controllers/Crud/TagController.php @@ -7,22 +7,15 @@ use App\Http\Requests\StoreTag; use App\Models\Campaign; use App\Models\Tag; -use App\Traits\TreeControllerTrait; class TagController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'tags'; protected string $route = 'tags'; protected $module = 'tags'; - /** @var string Model */ protected $model = Tag::class; - /** @var string Filter */ protected string $filter = TagFilter::class; /** diff --git a/app/Http/Controllers/Crud/TimelineController.php b/app/Http/Controllers/Crud/TimelineController.php index 604669d21a..aa0a4b59b8 100644 --- a/app/Http/Controllers/Crud/TimelineController.php +++ b/app/Http/Controllers/Crud/TimelineController.php @@ -7,18 +7,12 @@ use App\Http\Requests\StoreTimeline; use App\Models\Campaign; use App\Models\Timeline; -use App\Traits\TreeControllerTrait; class TimelineController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'timelines'; protected string $route = 'timelines'; - /** @var string */ protected $model = Timeline::class; protected string $filter = TimelineFilter::class; diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index 0cfdce8910..7816c75909 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -25,7 +25,10 @@ use Illuminate\Database\Eloquent\Model; use Illuminate\Http\Request; use Illuminate\Pagination\Paginator; +use Illuminate\Support\Arr; use Illuminate\Support\Collection; +use Illuminate\Support\Facades\Cookie; +use Illuminate\Support\Facades\Session; use LogicException; class CrudController extends Controller @@ -82,6 +85,8 @@ class CrudController extends Controller /** Determine if the create/store procedure has a limit checking in place */ protected bool $hasLimitCheck = false; + protected Request $request; + public function __construct() { $this->middleware('campaign.member'); @@ -109,6 +114,7 @@ public function crudIndex(Request $request) * Prepare a lot of variables that will be shared over to the view * @var MiscModel $model */ + $this->request = $request; $model = new $this->model(); $campaign = $this->campaign; $this->filterService @@ -131,20 +137,40 @@ public function crudIndex(Request $request) $datagridActions = new $this->datagridActions(); $templates = $this->loadTemplates($model); + // Determine if we're nested or not + $nested = $this->isNested(); + $base = $model ->preparedSelect() ->preparedWith() ->search($this->filterService->search()) ->order($this->filterService->order()) + ->distinct() ; $parent = null; if (request()->has('parent_id')) { - // @phpstan-ignore-next-line $parentKey = $model->getParentKeyName(); $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]); $parent = $model->where('id', request()->get('parent_id'))->first(); + if (request()->get('m') === 'table') { + if (!empty($parent) && !empty($parent->parent)) { + // Go back to previous parent + $this->addNavAction( + route($this->route . '.index', [$campaign, 'parent_id' => $parent->parent->id]), + ' ' . $parent->parent->name + ); + } else { + // Go back to first level + $this->addNavAction( + route($this->route . '.index', [$campaign]), + ' ' . __('crud.actions.back') + ); + } + } + } elseif ($nested) { + $base->whereNull($model->getTable() . '.' . $model->getParentKeyName()); } // Do this to avoid an extra sql query when no filters are selected @@ -174,22 +200,12 @@ public function crudIndex(Request $request) } // Switch between the new explore/grid mode and the old table - $mode = request()->get('m', 'grid'); - if (!in_array($mode, ['grid', 'table'])) { - $mode = 'grid'; - } + $mode = $this->mode(); $forceMode = null; if (property_exists($this, 'forceMode')) { $mode = $forceMode = $this->forceMode; } - // Add a button to the tree view if the controller has it - if (method_exists($this, 'tree') && $mode === 'table') { - $this->addNavAction( - route($this->route . '.tree', [$this->campaign, 'm' => 'table']), - ' ' . __('crud.actions.explore_view') - ); - } $this->getNavActions(); $actions = $this->navActions; $entityTypeId = $model->entityTypeId(); @@ -221,6 +237,9 @@ public function crudIndex(Request $request) } else { $data['titleKey'] = Module::plural($entityTypeId, __('entities.' . $langKey)); } + if (method_exists($model, 'getParentKeyName')) { + $data['nestable'] = $nested; + } return view('cruds.index', $data); } @@ -518,12 +537,7 @@ public function crudUpdate(Request $request, Model|MiscModel $model) } elseif ($request->has('submit-update')) { $route = route($this->route . '.edit', [$this->campaign, $model->id]); } elseif ($request->has('submit-close')) { - $subroute = 'index'; - $defaultNested = auth()->user()->defaultNested || $this->campaign->defaultToNested(); - if ($defaultNested && \Illuminate\Support\Facades\Route::has($this->route . '.tree')) { - $subroute = 'tree'; - } - $route = route($this->route . '.' . $subroute, [$this->campaign]); + $route = route($this->route . '.index', [$this->campaign]); } elseif ($request->has('submit-copy')) { $route = route($this->route . '.create', [$this->campaign, 'copy' => $model->id]); return response()->redirectTo($route); @@ -546,13 +560,7 @@ public function crudDestroy(Model|MiscModel $model) $model->delete(); - $subroute = 'index'; - $defaultNested = auth()->user()->defaultNested || $this->campaign->defaultToNested(); - if ($defaultNested && \Illuminate\Support\Facades\Route::has($this->route . '.tree')) { - $subroute = 'tree'; - } - - return redirect()->route($this->route . '.' . $subroute, $this->campaign) + return redirect()->route($this->route . '.index', $this->campaign) ->with('success', __('general.success.deleted', ['name' => $model->name])); } @@ -674,4 +682,75 @@ protected function loadTemplates($model): Collection } return Entity::select('id', 'name', 'entity_id')->templates($model->entityTypeID())->get(); } + + /** + * Determine if the layout is in the nice grid mode, or the old table mode + * @return string + */ + protected function mode(): string + { + if (!isset($this->module)) { + return 'table'; + } + $key = $this->module . '_mode'; + if ($this->request->has('m')) { + $mode = $this->request->get('m'); + if (!in_array($mode, ['grid', 'table'])) { + return 'grid'; + } + $newMode = $mode; + } + if (isset($newMode)) { + if (auth()->guest()) { + Session::put($key, $newMode); + } else { + $settings = auth()->user()->settings; + if (auth()->check() && Arr::get($settings, $key) !== $newMode) { + $settings[$key] = $newMode; + auth()->user()->settings = $settings; + auth()->user()->updateQuietly(); + } + } + return $newMode; + } + + if (auth()->guest()) { + return Session::get($key, 'grid'); + } + // Else use the user's preferred stacking for this entity type + return Arr::get(auth()->user()->settings, $key, true); + } + /** + * Determine if the current layout should be nested or not + * @return bool + */ + protected function isNested(): bool + { + // Model isn't nested, not an option to start with + if (!isset($this->module) || !method_exists($this->model, 'getParentKeyName')) { + return false; + } + $key = $this->module . '_nested'; + if ($this->request->has('n')) { + $new = (bool) $this->request->get('n'); + if (auth()->guest()) { + Session::put($key, $new); + } else { + $settings = auth()->user()->settings; + if (auth()->check() && Arr::get($settings, $key) !== $new) { + $settings = auth()->user()->settings; + $settings[$key] = $new; + auth()->user()->settings = $settings; + auth()->user()->updateQuietly(); + } + } + return $new; + } + + if (auth()->guest()) { + return (bool) Session::get($key, true); + } + // Else use the user's preferred stacking for this entity type + return Arr::get(auth()->user()->settings, $key, true); + } } diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php index 7613857171..57384658b5 100644 --- a/app/Models/Bookmark.php +++ b/app/Models/Bookmark.php @@ -249,11 +249,9 @@ protected function getEntityRoute(): string protected function getIndexRoute(): string { $filters = $this->filters . '&_clean=true&_from=bookmark&bookmark=' . $this->id; - $nestedType = (!empty($this->options['is_nested']) && $this->options['is_nested'] == '1' ? 'tree' : 'index'); - - $routeName = Str::plural($this->type) . ".{$nestedType}"; - if ($nestedType === 'tree' && !Route::has($routeName)) { - $routeName = Str::plural($this->type) . '.index'; + $routeName = Str::plural($this->type) . '.index'; + if (empty($this->options['is_nested']) && $this->options['is_nested'] == '1') { + $filters .= '&n=1'; } try { $campaign = CampaignLocalization::getCampaign(); diff --git a/app/Models/Relations/CampaignRelations.php b/app/Models/Relations/CampaignRelations.php index 9f49416d7d..fcffd9c003 100644 --- a/app/Models/Relations/CampaignRelations.php +++ b/app/Models/Relations/CampaignRelations.php @@ -107,7 +107,7 @@ public function nonAdmins() } $this->nonAdmins = new Collection(); // We can't exclude admins through pure SQL as some members might be role-less in weird edge cases - foreach ($this->members()->with(['user', 'user.campaignRoles'])->get() as $member) { + foreach ($this->members()->with(['user', 'user.campaignRoles', 'user.tutorials'])->get() as $member) { $isAdmin = false; /** @var CampaignRole $campaignRole */ foreach ($member->user->campaignRoles as $campaignRole) { diff --git a/app/Renderers/DatagridRenderer.php b/app/Renderers/DatagridRenderer.php index 72185e574b..ded61255f2 100644 --- a/app/Renderers/DatagridRenderer.php +++ b/app/Renderers/DatagridRenderer.php @@ -236,7 +236,6 @@ private function route(string $field = null, string $label = null) $routeOptions = [ 'campaign' => $this->campaign, - 'm' => 'table', 'order' => $field , 'page' => request()->get('page') ]; diff --git a/app/Services/BreadcrumbService.php b/app/Services/BreadcrumbService.php index 263861954c..7f801578c8 100644 --- a/app/Services/BreadcrumbService.php +++ b/app/Services/BreadcrumbService.php @@ -16,16 +16,11 @@ class BreadcrumbService public function index(string $name): string { // Determine the "mode" for logged-in users who prefer the old table view - $params = auth()->check() && auth()->user()->entityExplore === '1' ? ['m' => 'table'] : []; + $params = []; $params['campaign'] = $this->campaign; // If the user activated nested views by default, go back to it. $entityIndexRoute = route($name . '.index', $params); - if ($this->campaign->defaultToNested() || (auth()->check() && auth()->user()->defaultNested)) { - if (\Illuminate\Support\Facades\Route::has($name . '.tree')) { - $entityIndexRoute = route($name . '.tree', $params); - } - } return $entityIndexRoute; } diff --git a/app/Services/RecoveryService.php b/app/Services/RecoveryService.php index 502f2cc120..ab7f8a8883 100644 --- a/app/Services/RecoveryService.php +++ b/app/Services/RecoveryService.php @@ -123,7 +123,7 @@ protected function trashChild(Entity $entity, MiscModel $child = null) } // Set the campaign scope to avoid hitting entities of other campaigns (this can happen with - // nested trees) + // nested modules) \App\Facades\CampaignLocalization::setConsoleCampaign($entity->campaign_id); // Update the parent_id / tree before diff --git a/app/Services/SidebarService.php b/app/Services/SidebarService.php index 06c6c341fc..4db2cb07f7 100644 --- a/app/Services/SidebarService.php +++ b/app/Services/SidebarService.php @@ -204,56 +204,48 @@ protected function setupElements(): void 'locations' => [ 'icon' => config('entities.icons.location'), 'label' => 'entities.locations', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.location') ], 'maps' => [ 'icon' => config('entities.icons.map'), 'label' => 'entities.maps', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.map') ], 'organisations' => [ 'icon' => config('entities.icons.organisation'), 'label' => 'entities.organisations', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.organisation') ], 'families' => [ 'icon' => config('entities.icons.family'), 'label' => 'entities.families', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.family') ], 'calendars' => [ 'icon' => config('entities.icons.calendar'), 'label' => 'entities.calendars', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.calendar') ], 'timelines' => [ 'icon' => config('entities.icons.timeline'), 'label' => 'entities.timelines', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.timeline') ], 'races' => [ 'icon' => config('entities.icons.race'), 'label' => 'entities.races', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.race') ], 'creatures' => [ 'icon' => config('entities.icons.creature'), 'label' => 'entities.creatures', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.creature') ], @@ -266,42 +258,36 @@ protected function setupElements(): void 'quests' => [ 'icon' => config('entities.icons.quest'), 'label' => 'entities.quests', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.quest') ], 'journals' => [ 'icon' => config('entities.icons.journal'), 'label' => 'entities.journals', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.journal') ], 'items' => [ 'icon' => config('entities.icons.item'), 'label' => 'entities.items', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.item') ], 'events' => [ 'icon' => config('entities.icons.event'), 'label' => 'entities.events', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.event') ], 'abilities' => [ 'icon' => config('entities.icons.ability'), 'label' => 'entities.abilities', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.ability') ], 'notes' => [ 'icon' => config('entities.icons.note'), 'label' => 'entities.notes', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.note') ], @@ -322,7 +308,6 @@ protected function setupElements(): void 'tags' => [ 'icon' => config('entities.icons.tag'), 'label' => 'entities.tags', - 'tree' => true, 'mode' => true, 'type_id' => config('entities.ids.tag') ], diff --git a/app/Traits/TreeControllerTrait.php b/app/Traits/TreeControllerTrait.php index a7708ba459..0bdb1b5651 100644 --- a/app/Traits/TreeControllerTrait.php +++ b/app/Traits/TreeControllerTrait.php @@ -57,7 +57,7 @@ public function tree(Request $request, Campaign $campaign) if ($mode === 'table') { $this->addNavAction( - route($this->route . '.index', [$this->campaign, 'm' => 'table']), + route($this->route . '.index', [$this->campaign]), ' ' . __('entities.' . $this->view) ); } @@ -65,9 +65,10 @@ public function tree(Request $request, Campaign $campaign) $base = $model ->preparedSelect() ->preparedWith() - ->search(request()->get('search')) + ->search($this->filterService->search()) ->order($this->filterService->order()) - ->distinct(); + ->distinct() + ; /** @var Tag $model **/ $parentKey = $model->getParentKeyName(); diff --git a/lang/en/abilities.php b/lang/en/abilities.php index 1c211155e2..f49feeb0ed 100644 --- a/lang/en/abilities.php +++ b/lang/en/abilities.php @@ -18,9 +18,6 @@ 'fields' => [ 'charges' => 'Charges', ], - 'helpers' => [ - 'nested_without' => 'Displaying all abilities that don\'t have a parent ability. Click on a row to see the children abilities.', - ], 'placeholders' => [ 'charges' => 'Amount of charges. Reference attributes with {Level}*{CHA}', 'name' => 'Fireball, Alert, Cunning Strike', diff --git a/lang/en/bookmarks.php b/lang/en/bookmarks.php index e04961f228..d2bd6486c8 100644 --- a/lang/en/bookmarks.php +++ b/lang/en/bookmarks.php @@ -16,7 +16,6 @@ 'default_dashboard' => 'Default dashboard', 'entity' => 'Entity', 'filters' => 'Filters', - 'is_nested' => 'Nested', 'menu' => 'Subpage', 'position' => 'Position', 'random' => 'Random', diff --git a/lang/en/calendars.php b/lang/en/calendars.php index 3af16db2e4..4f4e317f59 100644 --- a/lang/en/calendars.php +++ b/lang/en/calendars.php @@ -107,7 +107,6 @@ 'format' => 'Add custom date formatting for calendar entities.', 'month_type' => 'Intercalary months don\'t use week days, but still influence moons and seasons.', 'moon_offset' => 'By default, the first fullmoon appears on the first day of year 0. Changing the offset will alter when the first full moon is displayed. This value can negative (up to the length of the first month) or positive (up to the length of the first month).', - 'nested_without' => 'Displaying all calendars that don\'t have a parent calendar. Click on a row to see the children calendars.', 'start_offset' => 'By default, the calendar starts on the first weekday of year 0. Changing this field influences where the calendar\'s first day is placed.', ], 'hints' => [ diff --git a/lang/en/campaigns.php b/lang/en/campaigns.php index 907ad800d5..26d38093cc 100644 --- a/lang/en/campaigns.php +++ b/lang/en/campaigns.php @@ -59,7 +59,6 @@ 'is_discreet' => 'Discreet', 'locale' => 'Locale', 'name' => 'Name', - 'nested' => 'Default entity lists to nested when available', 'open' => 'Open to applications', 'past_featured' => 'Previously featured campaign', 'post_collapsed' => 'New posts on entities are collapsed by default.', @@ -452,7 +451,6 @@ 'entity_history' => 'Entity\'s history logs', 'entity_image' => 'Entity\'s image', 'member_list' => 'Campaign\'s member list', - 'nested' => 'Default lists layout', 'post_collapsed' => 'New post default collapsed value', ], 'helpers' => [ @@ -469,10 +467,6 @@ 'hidden' => 'Only visible to campaign admins', 'visible' => 'Visible to members', ], - 'nested' => [ - 'nested' => 'Nested', - 'user' => 'User\'s default', - ], 'other' => 'Other', ], 'visibilities' => [ diff --git a/lang/en/creatures.php b/lang/en/creatures.php index 132839b435..aa4bb52371 100644 --- a/lang/en/creatures.php +++ b/lang/en/creatures.php @@ -7,9 +7,6 @@ 'fields' => [ 'is_extinct' => 'Extinct', ], - 'helpers' => [ - 'nested_without' => 'Displaying all creatures that don\'t have a parent creature. Click on a row to see the children creatures.', - ], 'hints' => [ 'is_extinct' => 'This creature is extinct.', ], diff --git a/lang/en/datagrids.php b/lang/en/datagrids.php index ac18c8d9dc..b8737ee751 100644 --- a/lang/en/datagrids.php +++ b/lang/en/datagrids.php @@ -7,6 +7,8 @@ 'modes' => [ 'grid' => 'Switch to the grid view', 'table' => 'Switch to the table view', + 'flatten' => 'Switch to a flattened layout', + 'nested' => 'Switch to a nested layout', ], 'tooltips' => [ 'nested' => 'This entity has children. Click on the image to view them.', diff --git a/lang/en/events.php b/lang/en/events.php index 39197790c3..ebef532137 100644 --- a/lang/en/events.php +++ b/lang/en/events.php @@ -12,7 +12,6 @@ ], 'helpers' => [ 'date' => 'This field can contain anything and is not linked to the campaign\'s calendars. To link this event to a calendar, go add it on the calendar or on the reminders subpage of this event.', - 'nested_without' => 'Displaying all events that don\'t have a parent event. Click on a row to see the children events.', ], 'placeholders' => [ 'date' => 'A date for your event', diff --git a/lang/en/families.php b/lang/en/families.php index ec2bc396c3..336b0c7b4b 100644 --- a/lang/en/families.php +++ b/lang/en/families.php @@ -7,10 +7,6 @@ 'fields' => [ 'members' => 'Members', ], - 'helpers' => [ - 'descendants' => 'This list contains all families which are descendants of this family, and not only those directly under it.', - 'nested_without' => 'Displaying all families that don\'t have a parent family. Click on a row to see the children families.', - ], 'hints' => [ 'members' => 'Members of a family are listed here. A character can be added to a family by editing the desired character and using the "Family" dropdown.', ], diff --git a/lang/en/items.php b/lang/en/items.php index 4622d41e61..b1596e33c0 100644 --- a/lang/en/items.php +++ b/lang/en/items.php @@ -10,9 +10,6 @@ 'price' => 'Price', 'size' => 'Size', ], - 'helpers' => [ - 'nested_without' => 'Displaying all items that don\'t have a parent item. Click on a row to see the children items.', - ], 'hints' => [ 'items' => 'Organise items by using the parent item field.', ], diff --git a/lang/en/journals.php b/lang/en/journals.php index dee9862cf1..fdfbc96dfa 100644 --- a/lang/en/journals.php +++ b/lang/en/journals.php @@ -8,10 +8,6 @@ 'author' => 'Author', 'date' => 'Date', ], - 'helpers' => [ - 'journals' => 'Display all or only the direct sub journals of this journal.', - 'nested_without' => 'Displaying all journals that don\'t have a parent journal. Click on a row to see the children journals.', - ], 'placeholders' => [ 'author' => 'Who wrote the journal', 'date' => 'Real world date of the journal', diff --git a/lang/en/locations.php b/lang/en/locations.php index 126f9103a7..1218a30d30 100644 --- a/lang/en/locations.php +++ b/lang/en/locations.php @@ -6,8 +6,6 @@ ], 'helpers' => [ 'characters' => 'View all characters in this location and its children locations, or just those directly located here.', - 'descendants' => 'This list contains all locations which are descendants of this location, not only those directly under it.', - 'nested_without' => 'Displaying all locations that don\'t have a parent location. Click on a row to see the children locations.', ], 'placeholders' => [ 'type' => 'City, Kingdom, Ruin', diff --git a/lang/en/maps.php b/lang/en/maps.php index e6ee8dbdb8..4750525d86 100644 --- a/lang/en/maps.php +++ b/lang/en/maps.php @@ -47,7 +47,6 @@ 'center' => 'Changing the following values will control which area of the map is focused on. Leaving these values empty will result in the center of the map being focued on.', 'centering' => 'Centering on a marker will take priority on default coordinates.', 'chunked_zoom' => 'Automatically cluster markers together when they are close to each other.', - 'descendants' => 'This list contains all maps which are descendants of this map, and not only those directly under it.', 'distance_measure' => 'Giving the map a distance measurement will enable the measurement tool in the exploration mode.', 'distance_measure_2' => 'For 100 pixels to measure 1 kilometer, input a value of 0.0041.', 'grid' => 'Define a grid size that will be displayed in the exploration mode.', @@ -57,7 +56,6 @@ 'max_zoom' => 'The most a map can be zoomed in on. The default value is :default, while the highest allowed value is :max.', 'min_zoom' => 'The most a map can be zoomed out of. The default value is :default, while the lowest allowed value is :min.', 'missing_image' => 'Save the map with an image before being able to add layers and markers.', - 'nested_without' => 'Displaying all maps that don\'t have a parent map. Click on a row to see the children maps.', ], 'panels' => [ 'groups' => 'Groups', diff --git a/lang/en/notes.php b/lang/en/notes.php index 22f416b8d2..74eed3503f 100644 --- a/lang/en/notes.php +++ b/lang/en/notes.php @@ -7,9 +7,6 @@ 'fields' => [ 'notes' => 'Sub Notes', ], - 'helpers' => [ - 'nested_without' => 'Displaying all notes that don\'t have a parent note. Click on a row to see the children notes.', - ], 'placeholders' => [ 'note' => 'Choose a parent note', 'type' => 'Religion, Race, Political system', diff --git a/lang/en/organisations.php b/lang/en/organisations.php index 75cdb77ce5..c08a1d02e8 100644 --- a/lang/en/organisations.php +++ b/lang/en/organisations.php @@ -8,10 +8,6 @@ 'is_defunct' => 'Defunct', 'members' => 'Members', ], - 'helpers' => [ - 'descendants' => 'This list contains all organisations which are descendants of this organisation, and not only those directly under it.', - 'nested_without' => 'Displaying all organisations that don\'t have a parent organisation. Click on a row to see the children organisations.', - ], 'hints' => [ 'is_defunct' => 'This organisation is defunct.', ], diff --git a/lang/en/quests.php b/lang/en/quests.php index fa1bfbd56f..8368b9a8b2 100644 --- a/lang/en/quests.php +++ b/lang/en/quests.php @@ -32,7 +32,6 @@ ], 'helpers' => [ 'is_completed' => 'The quest is considered as completed.', - 'nested_without' => 'Displaying all quests that don\'t have a parent quest. Click on a row to see the children quests.', ], 'hints' => [ 'quests' => 'A web of interlocking quests can be built using the Parent Quest field.', diff --git a/lang/en/races.php b/lang/en/races.php index 3966b9099b..ea0561302d 100644 --- a/lang/en/races.php +++ b/lang/en/races.php @@ -13,9 +13,6 @@ 'fields' => [ 'members' => 'Members', ], - 'helpers' => [ - 'nested_without' => 'Displaying all races that don\'t have a parent race. Click on a row to see the children races.', - ], 'members' => [ 'create' => [ 'submit' => 'Add members', diff --git a/lang/en/settings/appearance.php b/lang/en/settings/appearance.php index 0f150f3dc1..8d8898d417 100644 --- a/lang/en/settings/appearance.php +++ b/lang/en/settings/appearance.php @@ -27,7 +27,6 @@ 'fields' => [ 'campaign-order' => 'Campaign list order', 'date-format' => 'Date formatting', - 'default-nested' => 'Nested lists layout', 'editor' => 'Text editor', 'entity-explore' => 'Entity lists', 'mentions' => 'Mentions when editing', @@ -39,7 +38,6 @@ 'advanced-mentions' => 'When editing texts, control if mentions are rendered as the entity\'s name, or as the advanced mention.', 'campaign-order' => 'Change the order in which campaigns are listed in the campaign switcher.', 'date-format' => 'When available, control the format in which to display real world dates.', - 'default-nested' => 'Control how lists which support nesting are displayed by default.', 'editor' => 'Using the legacy text editor (TinyMCE) doesn\'t support mentions on mobile devices, campaign galleries or other advanced features.', 'entity-explore' => 'Control the way in which entity lists are displayed on campaigns.', 'new-entity-workflow' => 'Control which interface you are taken to after creating a new entity.', @@ -51,10 +49,6 @@ 'advanced' => 'Display advanced mentions :code', 'default' => 'Mentions as the entity name', ], - 'nested' => [ - 'default' => 'Flat lists', - 'nested' => 'Nested lists', - ], 'success' => 'Appearance options saved.', 'values' => [ 'pagination' => ':amount results per page', diff --git a/lang/en/tags.php b/lang/en/tags.php index 463aada0a1..bd6ca3d4f4 100644 --- a/lang/en/tags.php +++ b/lang/en/tags.php @@ -22,7 +22,6 @@ 'is_hidden' => 'Hidden from header and tooltip', ], 'helpers' => [ - 'nested_without' => 'Displaying all tags that don\'t have a parent tag. Click on a row to see the children tags.', 'no_children' => 'There are currently no entities tagged with this tag.', ], 'hints' => [ diff --git a/lang/en/timelines.php b/lang/en/timelines.php index 376e26ab17..b26b6f8254 100644 --- a/lang/en/timelines.php +++ b/lang/en/timelines.php @@ -16,7 +16,6 @@ 'reverse_order' => 'Reverse era order', ], 'helpers' => [ - 'nested_without' => 'Displaying all timelines that don\'t have a parent timeline. Click on a row to see the children timelines.', 'no_era_v2' => 'This timeline currently doesn\'t have any eras. Add one or several eras to it, after which you can add elements to the eras here.', 'reverse_order' => 'Enable to display eras in reverse chronological order (older era first)', ], diff --git a/phpstan.neon b/phpstan.neon index c1af1ee65f..0b9bd2b9b4 100644 --- a/phpstan.neon +++ b/phpstan.neon @@ -1,5 +1,5 @@ includes: - - ./vendor/nunomaduro/larastan/extension.neon + - ./vendor/larastan/larastan/extension.neon parameters: diff --git a/resources/views/abilities/_tree.blade.php b/resources/views/abilities/_tree.blade.php index 4f9d7166f6..e61493c81d 100644 --- a/resources/views/abilities/_tree.blade.php +++ b/resources/views/abilities/_tree.blade.php @@ -32,7 +32,7 @@ ] ]) ->options([ - 'route' => 'abilities.tree', + 'route' => 'abilities.index', 'baseRoute' => 'abilities', 'trans' => 'abilities.fields.', 'row' => [ diff --git a/resources/views/bookmarks/form/_entry.blade.php b/resources/views/bookmarks/form/_entry.blade.php index 4c6f7b7742..c343e3b5ce 100644 --- a/resources/views/bookmarks/form/_entry.blade.php +++ b/resources/views/bookmarks/form/_entry.blade.php @@ -115,43 +115,44 @@ -
+ +
-

{{ __('bookmarks.fields.selector') }}

- +

{{ __('bookmarks.fields.selector') }}

+ - - - -
- - - - - -
-@includeWhen(auth()->user()->isAdmin(), 'cruds.fields.privacy_callout') +
+ @includeWhen(auth()->user()->isAdmin(), 'cruds.fields.privacy_callout') + diff --git a/resources/views/bookmarks/form/_type.blade.php b/resources/views/bookmarks/form/_type.blade.php index 0e3313ef57..e9cd15587c 100644 --- a/resources/views/bookmarks/form/_type.blade.php +++ b/resources/views/bookmarks/form/_type.blade.php @@ -20,11 +20,11 @@ {!! Form::text('filters', FormCopy::field('filters')->string(), ['placeholder' => __('bookmarks.placeholders.filters'), 'class' => '', 'maxlength' => 191]) !!} - - {!! Form::hidden('options[is_nested]', 0) !!} - - {!! Form::checkbox('options[is_nested]', 1, empty($model->options) ? false : $model->options['is_nested']) !!} - - +{{-- --}} +{{-- {!! Form::hidden('options[is_nested]', 0) !!}--}} +{{-- --}} +{{-- {!! Form::checkbox('options[is_nested]', 1, empty($model->options) ? false : $model->options['is_nested']) !!}--}} +{{-- --}} +{{-- --}} diff --git a/resources/views/calendars/_tree.blade.php b/resources/views/calendars/_tree.blade.php index 748341e885..91003d96d0 100644 --- a/resources/views/calendars/_tree.blade.php +++ b/resources/views/calendars/_tree.blade.php @@ -41,7 +41,7 @@ ] ]) ->options([ - 'route' => 'calendars.tree', + 'route' => 'calendars.index', 'baseRoute' => 'calendars', 'trans' => 'calendars.fields.', 'row' => [ diff --git a/resources/views/campaigns/forms/panes/ui.blade.php b/resources/views/campaigns/forms/panes/ui.blade.php index 90af90615b..cee46201c3 100644 --- a/resources/views/campaigns/forms/panes/ui.blade.php +++ b/resources/views/campaigns/forms/panes/ui.blade.php @@ -102,12 +102,6 @@ {!! Form::select('ui_settings[connections_mode]', [0 => __('campaigns.ui.collapsed.default'), 1 => __('entities/relations.options.only_relations'), 2 => __('entities/relations.options.related'), 3 => __('entities/relations.options.mentions')], null, ['class' => 'w-full']) !!} - - {!! Form::select('ui_settings[nested]', [0 => __('campaigns.ui.nested.user'), 1 => __('campaigns.ui.nested.nested')], (!isset($model) ? 1 : null), ['class' => '']) !!} - - options([ - 'route' => 'creatures.tree', + 'route' => 'creatures.index', 'baseRoute' => 'creatures', 'trans' => 'creatures.fields.', 'row' => [ diff --git a/resources/views/cruds/datagrids/_grid.blade.php b/resources/views/cruds/datagrids/_grid.blade.php index 6df00f1d27..fbd6fc7ede 100644 --- a/resources/views/cruds/datagrids/_grid.blade.php +++ b/resources/views/cruds/datagrids/_grid.blade.php @@ -21,7 +21,7 @@ @if ($stacked > 0)
type)) data-type="{{ \Illuminate\Support\Str::slug($model->type) }}" @endif> - + @if ($model->is_private)
diff --git a/resources/views/cruds/datagrids/explore.blade.php b/resources/views/cruds/datagrids/explore.blade.php index 7f511ba62a..f1cfd2a172 100644 --- a/resources/views/cruds/datagrids/explore.blade.php +++ b/resources/views/cruds/datagrids/explore.blade.php @@ -20,7 +20,7 @@ @include('cruds.datagrids._grid') @endforeach - @if ($models->hasPages() && auth()->check() && !UserCache::dismissedTutorial('pagination')) + @if (auth()->check() && $models->hasPages() && !UserCache::dismissedTutorial('pagination'))
diff --git a/resources/views/cruds/tree.blade.php b/resources/views/cruds/tree.blade.php index c83817941a..ac54e37ab9 100644 --- a/resources/views/cruds/tree.blade.php +++ b/resources/views/cruds/tree.blade.php @@ -57,7 +57,7 @@ @endif @if($models->hasPages())
- {{ $models->appends('parent_id', request()->get('parent_id'))->appends('m', 'table')->onEachSide(0)->links() }} + {{ $models->appends('parent_id', request()->get('parent_id'))->onEachSide(0)->links() }}
@endif {!! Form::hidden('entity', $name) !!} @@ -69,7 +69,7 @@ @endif
- + @endsection @section('modals') diff --git a/resources/views/entities/components/header.blade.php b/resources/views/entities/components/header.blade.php index 64c412b576..754a5ad512 100644 --- a/resources/views/entities/components/header.blade.php +++ b/resources/views/entities/components/header.blade.php @@ -172,7 +172,7 @@ {{ __('crud.actions.new') }} - @if (\Illuminate\Support\Facades\Route::has($entity->pluralType() . '.tree')) + @if (method_exists($model, 'getParentKeyName')) {{ __('crud.actions.new_child') }} diff --git a/resources/views/entities/components/profile/_type.blade.php b/resources/views/entities/components/profile/_type.blade.php index b8791981e8..3c8890f77e 100644 --- a/resources/views/entities/components/profile/_type.blade.php +++ b/resources/views/entities/components/profile/_type.blade.php @@ -2,7 +2,7 @@
{{ __('crud.fields.type') }}
@php - $defaultOptions = auth()->check() && auth()->user()->entityExplore === '1' ? [$campaign, 'm' => 'table'] : [$campaign]; + $defaultOptions = [$campaign]; @endphp {!! link_to_route( $entity->pluralType() . '.index', diff --git a/resources/views/entities/pages/print/profile/_type.blade.php b/resources/views/entities/pages/print/profile/_type.blade.php index 86cdd58f5c..6d78256c93 100644 --- a/resources/views/entities/pages/print/profile/_type.blade.php +++ b/resources/views/entities/pages/print/profile/_type.blade.php @@ -1,6 +1,6 @@ @if (!empty($model->type)) @php -$defaultOptions = auth()->check() && auth()->user()->entityExplore === '1' ? [$campaign, 'm' => 'table'] : [$campaign]; +$defaultOptions = [$campaign]; @endphp | {{ __('crud.fields.type') }} | {{ $model->type }} | @endif diff --git a/resources/views/events/_tree.blade.php b/resources/views/events/_tree.blade.php index 7e1474fdd7..e5853da098 100644 --- a/resources/views/events/_tree.blade.php +++ b/resources/views/events/_tree.blade.php @@ -29,7 +29,7 @@ ] ]) ->options([ - 'route' => 'events.tree', + 'route' => 'events.index', 'baseRoute' => 'events', 'trans' => 'events.fields.', 'row' => [ diff --git a/resources/views/families/_tree.blade.php b/resources/views/families/_tree.blade.php index 920c741fee..c820017ce8 100644 --- a/resources/views/families/_tree.blade.php +++ b/resources/views/families/_tree.blade.php @@ -37,7 +37,7 @@ ] ]) ->options( [ - 'route' => 'families.tree', + 'route' => 'families.index', 'baseRoute' => 'families', 'trans' => 'families.fields.', 'row' => [ diff --git a/resources/views/items/_tree.blade.php b/resources/views/items/_tree.blade.php index 573423c7be..954dcca946 100644 --- a/resources/views/items/_tree.blade.php +++ b/resources/views/items/_tree.blade.php @@ -40,7 +40,7 @@ ] ]) ->options( [ - 'route' => 'items.tree', + 'route' => 'items.index', 'baseRoute' => 'items', 'trans' => 'items.fields.', 'row' => [ diff --git a/resources/views/journals/_tree.blade.php b/resources/views/journals/_tree.blade.php index 6044419534..23eee7d8c2 100644 --- a/resources/views/journals/_tree.blade.php +++ b/resources/views/journals/_tree.blade.php @@ -47,7 +47,7 @@ ] ]) ->options( [ - 'route' => 'journals.tree', + 'route' => 'journals.index', 'baseRoute' => 'journals', 'trans' => 'journals.fields.', 'row' => [ diff --git a/resources/views/layouts/datagrid/_togglers.blade.php b/resources/views/layouts/datagrid/_togglers.blade.php index 9ba80d26c5..82348a3910 100644 --- a/resources/views/layouts/datagrid/_togglers.blade.php +++ b/resources/views/layouts/datagrid/_togglers.blade.php @@ -1,4 +1,4 @@ -@if ($mode === 'grid') +@if ($mode === 'grid' && auth()->check())
-
-
-

- - {{ __('settings/appearance.fields.default-nested') }} -

- - - {{ __('settings/appearance.actions.learn-more') }} - -
-

- {{ __('settings/appearance.helpers.default-nested') }} - {{ __('settings/appearance.helpers.overridable')}} -

- {!! Form::select('default_nested', [ - 0 => __('settings/appearance.nested.default'), - 1 => __('settings/appearance.nested.nested'), - ], null, ['class' => ' flex self-end w-full border rounded p-2']) !!} -
-

diff --git a/resources/views/tags/_tree.blade.php b/resources/views/tags/_tree.blade.php index 6d51db41f4..2a73e41e31 100644 --- a/resources/views/tags/_tree.blade.php +++ b/resources/views/tags/_tree.blade.php @@ -66,7 +66,7 @@ ] ]) ->options( [ - 'route' => 'tags.tree', + 'route' => 'tags.index', 'baseRoute' => 'tags', 'trans' => 'tags.fields.', 'row' => [ diff --git a/resources/views/timelines/_tree.blade.php b/resources/views/timelines/_tree.blade.php index 0ce99d7704..dd920c7939 100644 --- a/resources/views/timelines/_tree.blade.php +++ b/resources/views/timelines/_tree.blade.php @@ -41,7 +41,7 @@ ] ]) ->options( [ - 'route' => 'timelines.tree', + 'route' => 'timelines.index', 'baseRoute' => 'timelines', 'trans' => 'timelines.fields.', 'row' => [ diff --git a/routes/campaigns/entities.php b/routes/campaigns/entities.php index a81fa4989c..0ca26052a4 100644 --- a/routes/campaigns/entities.php +++ b/routes/campaigns/entities.php @@ -9,7 +9,6 @@ // Abilities Route::get('/w/{campaign}/abilities/{ability}/abilities', 'Abilities\AbilityController@index')->name('abilities.abilities'); Route::get('/w/{campaign}/abilities/{ability}/entities', 'Abilities\EntityController@index')->name('abilities.entities'); -Route::get('/w/{campaign}/abilities/tree', 'Crud\AbilityController@tree')->name('abilities.tree'); Route::get('/w/{campaign}/abilities/{ability}/entity-add', 'Abilities\EntityController@create')->name('abilities.entity-add'); Route::post('/w/{campaign}/abilities/{ability}/entity-add', 'Abilities\EntityController@store')->name('abilities.entity-add.save'); @@ -27,7 +26,6 @@ Route::get('/w/{campaign}/maps/{map}/ticker', 'Maps\ExploreController@ticker')->name('maps.ticker'); Route::get('/w/{campaign}/maps/{map}/{map_marker}/details', 'Maps\Markers\DetailController@index')->name('maps.markers.details'); Route::post('/w/{campaign}/maps/{map}/{map_marker}/move', 'Maps\Markers\MoveController@index')->name('maps.markers.move'); -Route::get('/w/{campaign}/maps/tree', 'Crud\MapController@tree')->name('maps.tree'); Route::post('/w/{campaign}/maps/{map}/groups/bulk', 'Maps\Bulks\GroupController@index')->name('maps.groups.bulk'); Route::post('/w/{campaign}/maps/{map}/groups/reorder', 'Maps\Reorders\GroupController@index')->name('maps.groups.reorder-save'); @@ -43,19 +41,16 @@ Route::delete('/w/{campaign}/dice_rolls/{dice_roll}/roll/{dice_roll_result}/destroy', 'Crud\DiceRollController@destroyRoll')->name('dice_rolls.destroy_roll'); // Locations -Route::get('/w/{campaign}/locations/tree', 'Crud\LocationController@tree')->name('locations.tree'); Route::get('/w/{campaign}/locations/{location}/characters', 'Locations\CharacterController@index')->name('locations.characters'); Route::get('/w/{campaign}/locations/{location}/locations', 'Locations\LocationController@index')->name('locations.locations'); // Organisation menu Route::get('/w/{campaign}/organisations/{organisation}/members', 'Organisation\MemberController@index')->name('organisations.members'); Route::get('/w/{campaign}/organisations/{organisation}/organisations', 'Organisation\OrganisationController@organisations')->name('organisations.organisations'); -Route::get('/w/{campaign}/organisations/tree', 'Crud\OrganisationController@tree')->name('organisations.tree'); // Families menu Route::get('/w/{campaign}/families/{family}/members', 'Families\MemberController@index')->name('families.members'); Route::get('/w/{campaign}/families/{family}/families', 'Families\FamilyController@index')->name('families.families'); -Route::get('/w/{campaign}/families/tree', 'Crud\FamilyController@tree')->name('families.tree'); Route::get('/w/{campaign}/families/{family}/tree', [App\Http\Controllers\Families\TreeController::class, 'index'])->name('families.family-tree'); Route::get('/w/{campaign}/families/{family}/tree/api', [App\Http\Controllers\Families\Trees\ApiController::class, 'index'])->name('families.family-tree.api'); Route::get('/w/{campaign}/families/{entity}/tree/entity-api', [App\Http\Controllers\Families\Trees\ApiController::class, 'entity'])->name('families.family-tree.entity-api'); @@ -66,35 +61,28 @@ // Items menu Route::get('/w/{campaign}/items/{item}/inventories', 'Items\EntityController@index')->name('items.inventories'); -Route::get('/w/{campaign}/items/tree', 'Crud\ItemController@tree')->name('items.tree'); Route::get('/w/{campaign}/items/{item}/items', 'Items\ItemController@index')->name('items.items'); // Quest menus -Route::get('/w/{campaign}/quests/tree', 'Crud\QuestController@tree')->name('quests.tree'); Route::get('/w/{campaign}/quests/{quest}/quests', 'Quests\QuestController@index')->name('quests.quests'); // Races Route::get('/w/{campaign}/races/{race}/characters', 'Races\MemberController@index')->name('races.characters'); Route::get('/w/{campaign}/races/{race}/races', 'Races\RaceController@index')->name('races.races'); -Route::get('/w/{campaign}/races/tree', 'Crud\RaceController@tree')->name('races.tree'); Route::get('/w/{campaign}/races/{race}/member', 'Races\MemberController@create')->name('races.members.create'); Route::post('/w/{campaign}/races/{race}/member', 'Races\MemberController@store')->name('races.members.store'); // Creatures Route::get('/w/{campaign}/creatures/{creature}/creatures', 'Creatures\CreatureController@index')->name('creatures.creatures'); -Route::get('/w/{campaign}/creatures/tree', 'Crud\CreatureController@tree')->name('creatures.tree'); // Journal Route::get('/w/{campaign}/journals/{journal}/journals', 'Journals\JournalController@index')->name('journals.journals'); -Route::get('/w/{campaign}/events/tree', 'Crud\EventController@tree')->name('events.tree'); Route::get('/w/{campaign}/events/{event}/events', 'Events\EventController@index')->name('events.events'); -Route::get('/w/{campaign}/timelines/tree', 'Crud\TimelineController@tree')->name('timelines.tree'); Route::get('/w/{campaign}/timelines/{timeline}/timelines', 'Timelines\TimelineController@index')->name('timelines.timelines'); // Tag menus -Route::get('/w/{campaign}/tags/tree', 'Crud\TagController@tree')->name('tags.tree'); Route::get('/w/{campaign}/tags/{tag}/tags', 'Tags\TagController@index')->name('tags.tags'); Route::get('/w/{campaign}/tags/{tag}/transfer', 'Tags\TransferController@index')->name('tags.transfer'); Route::post('/w/{campaign}/tags/{tag}/transfer', 'Tags\TransferController@process')->name('tags.transfer'); @@ -111,12 +99,8 @@ Route::post('/w/{campaign}/bulk/process', 'BulkController@index')->name('bulk.process'); Route::get('/w/{campaign}/bulk/modal', 'BulkController@modal')->name('bulk.modal'); -Route::get('/w/{campaign}/notes/tree', 'Crud\NoteController@tree')->name('notes.tree'); -Route::get('/w/{campaign}/journals/tree', 'Crud\JournalController@tree')->name('journals.tree'); - // Calendar -Route::get('/w/{campaign}/calendars/tree', 'Crud\CalendarController@tree')->name('calendars.tree'); Route::get('/w/{campaign}/calendars/{calendar}/event', 'Calendars\EventController@create')->name('calendars.event.create'); Route::post('/w/{campaign}/calendars/{calendar}/event', 'Calendars\EventController@store')->name('calendars.event.store'); Route::get('/w/{campaign}/calendars/{calendar}/month-list', 'Crud\CalendarController@monthList')->name('calendars.month-list'); From ec33c15fd740689b3a21f44c3c77b1c28a04ace4 Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 11:58:00 -0600 Subject: [PATCH 2/8] Cleanup location model --- app/Models/Location.php | 40 +++++++++++----------------------------- 1 file changed, 11 insertions(+), 29 deletions(-) diff --git a/app/Models/Location.php b/app/Models/Location.php index f2afb9d9ec..fe73f2f2c5 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -11,6 +11,7 @@ use App\Traits\CampaignTrait; use App\Traits\ExportableTrait; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\Builder; use Staudenmeir\LaravelAdjacencyList\Eloquent\HasRecursiveRelationships; @@ -137,64 +138,45 @@ public function location() return $this->belongsTo('App\Models\Location', 'location_id', 'id'); } - /** - * - */ - public function characters() + public function characters(): HasMany { return $this->hasMany('App\Models\Character', 'location_id', 'id'); } - /** - */ - public function races() + public function races(): HasMany { return $this->belongsToMany('App\Models\Race', 'race_location'); } - /** - */ - public function creatures() + public function creatures(): HasMany { return $this->belongsToMany('App\Models\Creature', 'creature_location'); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function locationAttributes() + public function locationAttributes(): HasMany { return $this->hasMany('App\Models\LocationAttribute', 'location_id', 'id'); } - /** - */ - public function items() + public function items(): HasMany { return $this->hasMany('App\Models\Item', 'location_id', 'id'); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function maps() + public function maps(): HasMany { return $this->hasMany('App\Models\Map', 'location_id', 'id') + ->with('entity') + ->with('entity.image') ->select(['id', 'name', 'is_real']); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function locations() + public function locations(): HasMany { return $this->hasMany('App\Models\Location', 'location_id', 'id'); } - /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany - */ - public function events() + public function events(): HasMany { return $this->hasMany('App\Models\Event', 'location_id', 'id'); } From 1417c0037474af9f7fb20f982418e921f987b51c Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 18:00:50 +0000 Subject: [PATCH 3/8] Fix styling --- app/Http/Controllers/CrudController.php | 3 --- .../Controllers/Search/FullTextController.php | 15 ++------------- app/Models/CampaignUser.php | 2 +- app/Models/Location.php | 6 +++--- app/Services/Search/EntitySearchService.php | 8 ++++---- routes/campaigns/search.php | 2 +- 6 files changed, 11 insertions(+), 25 deletions(-) diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index 7816c75909..247f5b9c58 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -27,7 +27,6 @@ use Illuminate\Pagination\Paginator; use Illuminate\Support\Arr; use Illuminate\Support\Collection; -use Illuminate\Support\Facades\Cookie; use Illuminate\Support\Facades\Session; use LogicException; @@ -685,7 +684,6 @@ protected function loadTemplates($model): Collection /** * Determine if the layout is in the nice grid mode, or the old table mode - * @return string */ protected function mode(): string { @@ -722,7 +720,6 @@ protected function mode(): string } /** * Determine if the current layout should be nested or not - * @return bool */ protected function isNested(): bool { diff --git a/app/Http/Controllers/Search/FullTextController.php b/app/Http/Controllers/Search/FullTextController.php index 0ca6096374..1ec674df28 100644 --- a/app/Http/Controllers/Search/FullTextController.php +++ b/app/Http/Controllers/Search/FullTextController.php @@ -39,7 +39,7 @@ public function index(Campaign $campaign, Request $request) * Prepare a lot of variables that will be shared over to the view * @var MiscModel $model */ - + $name = 'characters'; $unfilteredCount = $base->count(); @@ -55,7 +55,7 @@ public function index(Campaign $campaign, Request $request) } $mode = 'grid'; - + $forceMode = null; //$actions = $this->navActions; @@ -74,14 +74,3 @@ public function index(Campaign $campaign, Request $request) } - - - - - - - - - - - diff --git a/app/Models/CampaignUser.php b/app/Models/CampaignUser.php index f91a17d346..5c81879329 100644 --- a/app/Models/CampaignUser.php +++ b/app/Models/CampaignUser.php @@ -96,7 +96,7 @@ public function scopeWithoutAdmins(Builder $builder) ->distinct() ->select($this->getTable() . '.*') ->leftJoin('campaign_role_users as cru', 'cru.user_id', $this->getTable() . '.user_id') - ->leftJoin('campaign_roles as cr', function ($on) { + ->leftJoin('campaign_roles as cr', function ($on) { $on->on('cr.id', 'cru.campaign_role_id') ->whereRaw('cr.campaign_id = ' . $this->getTable() . '.campaign_id'); }) diff --git a/app/Models/Location.php b/app/Models/Location.php index fe73f2f2c5..c5f263d892 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -198,7 +198,7 @@ public function allCharacters() } /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany + * @return HasMany */ public function families() { @@ -220,7 +220,7 @@ public function allFamilies() } /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany + * @return HasMany */ public function journals() { @@ -228,7 +228,7 @@ public function journals() } /** - * @return \Illuminate\Database\Eloquent\Relations\HasMany + * @return HasMany */ public function organisations() { diff --git a/app/Services/Search/EntitySearchService.php b/app/Services/Search/EntitySearchService.php index 3521e446f0..c38fbb6158 100644 --- a/app/Services/Search/EntitySearchService.php +++ b/app/Services/Search/EntitySearchService.php @@ -33,10 +33,10 @@ public function search(string $term = null, string $term2 = null): array $queries = [ (new SearchQuery()) - ->setIndexUid('entities') - ->setQuery($term) - ->setAttributesToRetrieve(['id', 'entity_id', 'type']) - ->setLimit(10) + ->setIndexUid('entities') + ->setQuery($term) + ->setAttributesToRetrieve(['id', 'entity_id', 'type']) + ->setLimit(10) ]; if ($term2) { diff --git a/routes/campaigns/search.php b/routes/campaigns/search.php index af5779597e..993e21a0cd 100644 --- a/routes/campaigns/search.php +++ b/routes/campaigns/search.php @@ -47,4 +47,4 @@ Route::get('/w/{campaign}/search/live', [App\Http\Controllers\Search\LiveController::class, 'index'])->name('search.live'); Route::get('/w/{campaign}/search/recent', [App\Http\Controllers\Search\RecentController::class, 'index'])->name('search.recent'); -Route::get('/w/{campaign}/search/fulltext', [\App\Http\Controllers\Search\FullTextController::class, 'index'])->name('search.fulltext'); \ No newline at end of file +Route::get('/w/{campaign}/search/fulltext', [App\Http\Controllers\Search\FullTextController::class, 'index'])->name('search.fulltext'); From 9057a6e9b3bf1e7b57c456a0451ff0b6b8f05519 Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 12:09:39 -0600 Subject: [PATCH 4/8] Cleanup controllers --- app/Http/Controllers/Crud/AbilityController.php | 2 +- .../Controllers/Crud/AttributeTemplateController.php | 4 +++- app/Http/Controllers/Crud/BookmarkController.php | 3 +-- app/Http/Controllers/Crud/CalendarController.php | 2 +- app/Http/Controllers/Crud/CharacterController.php | 2 +- app/Http/Controllers/Crud/ConversationController.php | 7 +------ app/Http/Controllers/Crud/CreatureController.php | 2 +- app/Http/Controllers/Crud/DiceRollController.php | 7 +------ .../Controllers/Crud/DiceRollResultController.php | 6 +----- app/Http/Controllers/Crud/EventController.php | 2 +- app/Http/Controllers/Crud/FamilyController.php | 2 +- app/Http/Controllers/Crud/ItemController.php | 2 +- app/Http/Controllers/Crud/JournalController.php | 2 +- app/Http/Controllers/Crud/LocationController.php | 2 +- app/Http/Controllers/Crud/MapController.php | 11 +---------- app/Http/Controllers/Crud/NoteController.php | 2 +- app/Http/Controllers/Crud/OrganisationController.php | 2 +- app/Http/Controllers/Crud/QuestController.php | 2 +- app/Http/Controllers/Crud/RaceController.php | 2 +- app/Http/Controllers/Crud/TagController.php | 2 +- app/Http/Controllers/Crud/TimelineController.php | 2 +- app/Http/Controllers/CrudController.php | 4 ++-- app/Http/Controllers/Entity/ReminderController.php | 2 +- app/Http/Controllers/RelationController.php | 3 +-- app/Models/AttributeTemplate.php | 2 ++ app/Models/Location.php | 5 +++-- resources/views/layouts/datagrid/_togglers.blade.php | 2 +- 27 files changed, 33 insertions(+), 53 deletions(-) diff --git a/app/Http/Controllers/Crud/AbilityController.php b/app/Http/Controllers/Crud/AbilityController.php index 6191973170..5c13c0ebcd 100644 --- a/app/Http/Controllers/Crud/AbilityController.php +++ b/app/Http/Controllers/Crud/AbilityController.php @@ -14,7 +14,7 @@ class AbilityController extends CrudController protected string $route = 'abilities'; protected string $module = 'abilities'; - protected $model = Ability::class; + protected string $model = Ability::class; protected string $filter = AbilityFilter::class; diff --git a/app/Http/Controllers/Crud/AttributeTemplateController.php b/app/Http/Controllers/Crud/AttributeTemplateController.php index 2b751f5328..f9958f745b 100644 --- a/app/Http/Controllers/Crud/AttributeTemplateController.php +++ b/app/Http/Controllers/Crud/AttributeTemplateController.php @@ -14,10 +14,12 @@ class AttributeTemplateController extends CrudController protected string $route = 'attribute_templates'; protected string $module = 'entity_attributes'; - protected $model = AttributeTemplate::class; + protected string $model = AttributeTemplate::class; protected string $filter = AttributeTemplateFilter::class; + protected string $forceMode = 'table'; + protected function getNavActions(): CrudController { $this->addNavAction( diff --git a/app/Http/Controllers/Crud/BookmarkController.php b/app/Http/Controllers/Crud/BookmarkController.php index 7c571f962e..7455506b2b 100644 --- a/app/Http/Controllers/Crud/BookmarkController.php +++ b/app/Http/Controllers/Crud/BookmarkController.php @@ -21,8 +21,7 @@ class BookmarkController extends CrudController protected bool $tabCopy = false; protected bool $hasLimitCheck = true; - /** @var string */ - protected $model = Bookmark::class; + protected string $model = Bookmark::class; /** */ protected string $datagridActions = BookmarkDatagridActions::class; diff --git a/app/Http/Controllers/Crud/CalendarController.php b/app/Http/Controllers/Crud/CalendarController.php index 1a5fa93aa1..8d7d8528dd 100644 --- a/app/Http/Controllers/Crud/CalendarController.php +++ b/app/Http/Controllers/Crud/CalendarController.php @@ -15,7 +15,7 @@ class CalendarController extends CrudController protected string $route = 'calendars'; protected $module = 'calendars'; - protected $model = Calendar::class; + protected string $model = Calendar::class; protected string $filter = CalendarFilter::class; diff --git a/app/Http/Controllers/Crud/CharacterController.php b/app/Http/Controllers/Crud/CharacterController.php index 921ff8ebed..70eb3cb378 100644 --- a/app/Http/Controllers/Crud/CharacterController.php +++ b/app/Http/Controllers/Crud/CharacterController.php @@ -14,7 +14,7 @@ class CharacterController extends CrudController protected string $route = 'characters'; protected $module = 'characters'; - protected $model = Character::class; + protected string $model = Character::class; protected string $filter = CharacterFilter::class; diff --git a/app/Http/Controllers/Crud/ConversationController.php b/app/Http/Controllers/Crud/ConversationController.php index 2cc440cfc7..c6c4607c19 100644 --- a/app/Http/Controllers/Crud/ConversationController.php +++ b/app/Http/Controllers/Crud/ConversationController.php @@ -11,19 +11,14 @@ class ConversationController extends CrudController { - /** - */ protected string $view = 'conversations'; protected string $route = 'conversations'; protected $module = 'conversations'; - /** @var string Model */ - protected $model = Conversation::class; + protected string $model = Conversation::class; - /** @var string Filter */ protected string $filter = ConversationFilter::class; - /** */ protected string $datagridActions = DeprecatedDatagridActions::class; protected string $forceMode = 'table'; diff --git a/app/Http/Controllers/Crud/CreatureController.php b/app/Http/Controllers/Crud/CreatureController.php index 631a95a06b..f80c737109 100644 --- a/app/Http/Controllers/Crud/CreatureController.php +++ b/app/Http/Controllers/Crud/CreatureController.php @@ -14,7 +14,7 @@ class CreatureController extends CrudController protected string $route = 'creatures'; protected $module = 'creatures'; - protected $model = Creature::class; + protected string $model = Creature::class; protected string $filter = CreatureFilter::class; diff --git a/app/Http/Controllers/Crud/DiceRollController.php b/app/Http/Controllers/Crud/DiceRollController.php index b202a7194f..9cac6a42fe 100644 --- a/app/Http/Controllers/Crud/DiceRollController.php +++ b/app/Http/Controllers/Crud/DiceRollController.php @@ -14,19 +14,14 @@ class DiceRollController extends CrudController { - /** - */ protected string $view = 'dice_rolls'; protected string $route = 'dice_rolls'; protected $module = 'dice_rolls'; - /** @var string Model */ - protected $model = DiceRoll::class; + protected string $model = DiceRoll::class; - /** @var string Filter */ protected string $filter = DiceRollFilter::class; - /** */ protected string $datagridActions = DeprecatedDatagridActions::class; protected string $forceMode = 'table'; diff --git a/app/Http/Controllers/Crud/DiceRollResultController.php b/app/Http/Controllers/Crud/DiceRollResultController.php index 4fe634f81a..3db0b2d756 100644 --- a/app/Http/Controllers/Crud/DiceRollResultController.php +++ b/app/Http/Controllers/Crud/DiceRollResultController.php @@ -10,15 +10,11 @@ class DiceRollResultController extends CrudController { - /** - */ protected string $view = 'dice_roll_results'; protected string $route = 'dice_roll_results'; - /** @var string Model */ - protected $model = DiceRollResult::class; + protected string $model = DiceRollResult::class; - /** @var string Filter */ protected string $filter = DiceRollResult::class; protected string $forceMode = 'table'; diff --git a/app/Http/Controllers/Crud/EventController.php b/app/Http/Controllers/Crud/EventController.php index 08d699f8e3..b747817cb8 100644 --- a/app/Http/Controllers/Crud/EventController.php +++ b/app/Http/Controllers/Crud/EventController.php @@ -14,7 +14,7 @@ class EventController extends CrudController protected string $route = 'events'; protected $module = 'events'; - protected $model = Event::class; + protected string $model = Event::class; protected string $filter = EventFilter::class; diff --git a/app/Http/Controllers/Crud/FamilyController.php b/app/Http/Controllers/Crud/FamilyController.php index 6c86888aca..9bd78692f1 100644 --- a/app/Http/Controllers/Crud/FamilyController.php +++ b/app/Http/Controllers/Crud/FamilyController.php @@ -14,7 +14,7 @@ class FamilyController extends CrudController protected string $route = 'families'; protected $module = 'families'; - protected $model = Family::class; + protected string $model = Family::class; protected string $filter = FamilyFilter::class; diff --git a/app/Http/Controllers/Crud/ItemController.php b/app/Http/Controllers/Crud/ItemController.php index e156c40311..e91afe3984 100644 --- a/app/Http/Controllers/Crud/ItemController.php +++ b/app/Http/Controllers/Crud/ItemController.php @@ -14,7 +14,7 @@ class ItemController extends CrudController protected string $route = 'items'; protected $module = 'items'; - protected $model = Item::class; + protected string $model = Item::class; protected string $filter = ItemFilter::class; diff --git a/app/Http/Controllers/Crud/JournalController.php b/app/Http/Controllers/Crud/JournalController.php index c5fce9531f..4c686f607e 100644 --- a/app/Http/Controllers/Crud/JournalController.php +++ b/app/Http/Controllers/Crud/JournalController.php @@ -14,7 +14,7 @@ class JournalController extends CrudController protected string $route = 'journals'; protected $module = 'journals'; - protected $model = Journal::class; + protected string $model = Journal::class; protected string $filter = JournalFilter::class; diff --git a/app/Http/Controllers/Crud/LocationController.php b/app/Http/Controllers/Crud/LocationController.php index 8f440993b5..f17cae04c8 100644 --- a/app/Http/Controllers/Crud/LocationController.php +++ b/app/Http/Controllers/Crud/LocationController.php @@ -14,7 +14,7 @@ class LocationController extends CrudController protected string $route = 'locations'; protected $module = 'locations'; - protected $model = Location::class; + protected string $model = Location::class; protected string $filter = LocationFilter::class; diff --git a/app/Http/Controllers/Crud/MapController.php b/app/Http/Controllers/Crud/MapController.php index 9fc619447e..b5ae3f326e 100644 --- a/app/Http/Controllers/Crud/MapController.php +++ b/app/Http/Controllers/Crud/MapController.php @@ -7,24 +7,15 @@ use App\Http\Requests\StoreMap; use App\Models\Campaign; use App\Models\Map; -use App\Traits\TreeControllerTrait; class MapController extends CrudController { - use TreeControllerTrait; - - /** - */ protected string $view = 'maps'; protected string $route = 'maps'; protected $module = 'maps'; - /** - * Crud models - */ - protected $model = Map::class; + protected string $model = Map::class; - /** @var string Filter */ protected string $filter = MapFilter::class; diff --git a/app/Http/Controllers/Crud/NoteController.php b/app/Http/Controllers/Crud/NoteController.php index a1d33b24fc..d930d5f7be 100644 --- a/app/Http/Controllers/Crud/NoteController.php +++ b/app/Http/Controllers/Crud/NoteController.php @@ -14,7 +14,7 @@ class NoteController extends CrudController protected string $route = 'notes'; protected $module = 'notes'; - protected $model = Note::class; + protected string $model = Note::class; protected string $filter = NoteFilter::class; diff --git a/app/Http/Controllers/Crud/OrganisationController.php b/app/Http/Controllers/Crud/OrganisationController.php index 7292de528e..e00fba8a89 100644 --- a/app/Http/Controllers/Crud/OrganisationController.php +++ b/app/Http/Controllers/Crud/OrganisationController.php @@ -14,7 +14,7 @@ class OrganisationController extends CrudController protected string $route = 'organisations'; protected $module = 'organisations'; - protected $model = Organisation::class; + protected string $model = Organisation::class; protected string $filter = OrganisationFilter::class; diff --git a/app/Http/Controllers/Crud/QuestController.php b/app/Http/Controllers/Crud/QuestController.php index 2fe96335c9..49bca008c7 100644 --- a/app/Http/Controllers/Crud/QuestController.php +++ b/app/Http/Controllers/Crud/QuestController.php @@ -14,7 +14,7 @@ class QuestController extends CrudController protected string $route = 'quests'; protected $module = 'quests'; - protected $model = Quest::class; + protected string $model = Quest::class; protected string $filter = QuestFilter::class; diff --git a/app/Http/Controllers/Crud/RaceController.php b/app/Http/Controllers/Crud/RaceController.php index 09072ea108..eb307a14f5 100644 --- a/app/Http/Controllers/Crud/RaceController.php +++ b/app/Http/Controllers/Crud/RaceController.php @@ -14,7 +14,7 @@ class RaceController extends CrudController protected string $route = 'races'; protected $module = 'races'; - protected $model = Race::class; + protected string $model = Race::class; protected string $filter = RaceFilter::class; diff --git a/app/Http/Controllers/Crud/TagController.php b/app/Http/Controllers/Crud/TagController.php index 399e13f87c..349fa6ae9f 100644 --- a/app/Http/Controllers/Crud/TagController.php +++ b/app/Http/Controllers/Crud/TagController.php @@ -14,7 +14,7 @@ class TagController extends CrudController protected string $route = 'tags'; protected $module = 'tags'; - protected $model = Tag::class; + protected string $model = Tag::class; protected string $filter = TagFilter::class; diff --git a/app/Http/Controllers/Crud/TimelineController.php b/app/Http/Controllers/Crud/TimelineController.php index aa0a4b59b8..dadca08091 100644 --- a/app/Http/Controllers/Crud/TimelineController.php +++ b/app/Http/Controllers/Crud/TimelineController.php @@ -13,7 +13,7 @@ class TimelineController extends CrudController protected string $view = 'timelines'; protected string $route = 'timelines'; - protected $model = Timeline::class; + protected string $model = Timeline::class; protected string $filter = TimelineFilter::class; diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index 247f5b9c58..77c791602d 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -44,8 +44,8 @@ class CrudController extends Controller /** The name of the route for the resource */ protected string $route = ''; - /** @var MiscModel|Model|string|null */ - protected $model; + /** Model class name for the object */ + protected string $model; protected string $filter; diff --git a/app/Http/Controllers/Entity/ReminderController.php b/app/Http/Controllers/Entity/ReminderController.php index 7c0811c7f9..9fe08f6d48 100644 --- a/app/Http/Controllers/Entity/ReminderController.php +++ b/app/Http/Controllers/Entity/ReminderController.php @@ -31,7 +31,7 @@ class ReminderController extends Controller protected CalendarService $calendarService; - protected $model = EntityEvent::class; + protected string $model = EntityEvent::class; public function __construct(CalendarService $calendarService) { diff --git a/app/Http/Controllers/RelationController.php b/app/Http/Controllers/RelationController.php index f79ffa119c..4e8e39375f 100644 --- a/app/Http/Controllers/RelationController.php +++ b/app/Http/Controllers/RelationController.php @@ -25,8 +25,7 @@ class RelationController extends CrudController protected string $forceMode = 'table'; - /** @var string */ - protected $model = Relation::class; + protected string $model = Relation::class; /** @var string The datagrid controlling the bulk actions */ protected string $datagridActions = RelationDatagridActions::class; diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php index 4a65f3b17b..4741e7beb1 100644 --- a/app/Models/AttributeTemplate.php +++ b/app/Models/AttributeTemplate.php @@ -114,6 +114,8 @@ public function scopePreparedWith(Builder $query): Builder 'entity.image' => function ($sub) { $sub->select('campaign_id', 'id', 'ext', 'focus_x', 'focus_y'); }, + 'attributeTemplate', + 'entityType', 'children' => function ($sub) { $sub->select('id', 'attribute_template_id'); } diff --git a/app/Models/Location.php b/app/Models/Location.php index c5f263d892..9d3d2cacaf 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -11,6 +11,7 @@ use App\Traits\CampaignTrait; use App\Traits\ExportableTrait; use Illuminate\Database\Eloquent\Collection; +use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\SoftDeletes; use Illuminate\Database\Eloquent\Builder; @@ -143,12 +144,12 @@ public function characters(): HasMany return $this->hasMany('App\Models\Character', 'location_id', 'id'); } - public function races(): HasMany + public function races(): BelongsToMany { return $this->belongsToMany('App\Models\Race', 'race_location'); } - public function creatures(): HasMany + public function creatures(): BelongsToMany { return $this->belongsToMany('App\Models\Creature', 'creature_location'); } diff --git a/resources/views/layouts/datagrid/_togglers.blade.php b/resources/views/layouts/datagrid/_togglers.blade.php index 82348a3910..d2e844cd89 100644 --- a/resources/views/layouts/datagrid/_togglers.blade.php +++ b/resources/views/layouts/datagrid/_togglers.blade.php @@ -41,7 +41,7 @@ @endif @endif -@if (isset($nestable)) +@if (isset($nestable) && empty($forceMode)) @if ($nestable) From 94178814af8113b40c0715de755d1fdbff10d897 Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 12:12:17 -0600 Subject: [PATCH 5/8] Cleanup controllers --- app/Http/Controllers/Crud/CalendarController.php | 2 +- app/Http/Controllers/Crud/CharacterController.php | 2 +- app/Http/Controllers/Crud/ConversationController.php | 2 +- app/Http/Controllers/Crud/CreatureController.php | 2 +- app/Http/Controllers/Crud/DiceRollController.php | 2 +- app/Http/Controllers/Crud/EventController.php | 2 +- app/Http/Controllers/Crud/FamilyController.php | 2 +- app/Http/Controllers/Crud/ItemController.php | 2 +- app/Http/Controllers/Crud/JournalController.php | 2 +- app/Http/Controllers/Crud/LocationController.php | 2 +- app/Http/Controllers/Crud/MapController.php | 2 +- app/Http/Controllers/Crud/NoteController.php | 2 +- app/Http/Controllers/Crud/OrganisationController.php | 2 +- app/Http/Controllers/Crud/QuestController.php | 2 +- app/Http/Controllers/Crud/RaceController.php | 2 +- app/Http/Controllers/Crud/TagController.php | 2 +- app/Http/Controllers/Crud/TimelineController.php | 2 +- app/Http/Controllers/CrudController.php | 5 ++++- 18 files changed, 21 insertions(+), 18 deletions(-) diff --git a/app/Http/Controllers/Crud/CalendarController.php b/app/Http/Controllers/Crud/CalendarController.php index 8d7d8528dd..a541bab3d6 100644 --- a/app/Http/Controllers/Crud/CalendarController.php +++ b/app/Http/Controllers/Crud/CalendarController.php @@ -13,7 +13,7 @@ class CalendarController extends CrudController { protected string $view = 'calendars'; protected string $route = 'calendars'; - protected $module = 'calendars'; + protected string $module = 'calendars'; protected string $model = Calendar::class; diff --git a/app/Http/Controllers/Crud/CharacterController.php b/app/Http/Controllers/Crud/CharacterController.php index 70eb3cb378..93b02bc7bb 100644 --- a/app/Http/Controllers/Crud/CharacterController.php +++ b/app/Http/Controllers/Crud/CharacterController.php @@ -12,7 +12,7 @@ class CharacterController extends CrudController { protected string $view = 'characters'; protected string $route = 'characters'; - protected $module = 'characters'; + protected string $module = 'characters'; protected string $model = Character::class; diff --git a/app/Http/Controllers/Crud/ConversationController.php b/app/Http/Controllers/Crud/ConversationController.php index c6c4607c19..77829b4927 100644 --- a/app/Http/Controllers/Crud/ConversationController.php +++ b/app/Http/Controllers/Crud/ConversationController.php @@ -13,7 +13,7 @@ class ConversationController extends CrudController { protected string $view = 'conversations'; protected string $route = 'conversations'; - protected $module = 'conversations'; + protected string $module = 'conversations'; protected string $model = Conversation::class; diff --git a/app/Http/Controllers/Crud/CreatureController.php b/app/Http/Controllers/Crud/CreatureController.php index f80c737109..a6d8b59910 100644 --- a/app/Http/Controllers/Crud/CreatureController.php +++ b/app/Http/Controllers/Crud/CreatureController.php @@ -12,7 +12,7 @@ class CreatureController extends CrudController { protected string $view = 'creatures'; protected string $route = 'creatures'; - protected $module = 'creatures'; + protected string $module = 'creatures'; protected string $model = Creature::class; diff --git a/app/Http/Controllers/Crud/DiceRollController.php b/app/Http/Controllers/Crud/DiceRollController.php index 9cac6a42fe..3174d6fea8 100644 --- a/app/Http/Controllers/Crud/DiceRollController.php +++ b/app/Http/Controllers/Crud/DiceRollController.php @@ -16,7 +16,7 @@ class DiceRollController extends CrudController { protected string $view = 'dice_rolls'; protected string $route = 'dice_rolls'; - protected $module = 'dice_rolls'; + protected string $module = 'dice_rolls'; protected string $model = DiceRoll::class; diff --git a/app/Http/Controllers/Crud/EventController.php b/app/Http/Controllers/Crud/EventController.php index b747817cb8..cdb887eeab 100644 --- a/app/Http/Controllers/Crud/EventController.php +++ b/app/Http/Controllers/Crud/EventController.php @@ -12,7 +12,7 @@ class EventController extends CrudController { protected string $view = 'events'; protected string $route = 'events'; - protected $module = 'events'; + protected string $module = 'events'; protected string $model = Event::class; diff --git a/app/Http/Controllers/Crud/FamilyController.php b/app/Http/Controllers/Crud/FamilyController.php index 9bd78692f1..1c69ff4b22 100644 --- a/app/Http/Controllers/Crud/FamilyController.php +++ b/app/Http/Controllers/Crud/FamilyController.php @@ -12,7 +12,7 @@ class FamilyController extends CrudController { protected string $view = 'families'; protected string $route = 'families'; - protected $module = 'families'; + protected string $module = 'families'; protected string $model = Family::class; diff --git a/app/Http/Controllers/Crud/ItemController.php b/app/Http/Controllers/Crud/ItemController.php index e91afe3984..e5b6c6a99a 100644 --- a/app/Http/Controllers/Crud/ItemController.php +++ b/app/Http/Controllers/Crud/ItemController.php @@ -12,7 +12,7 @@ class ItemController extends CrudController { protected string $view = 'items'; protected string $route = 'items'; - protected $module = 'items'; + protected string $module = 'items'; protected string $model = Item::class; diff --git a/app/Http/Controllers/Crud/JournalController.php b/app/Http/Controllers/Crud/JournalController.php index 4c686f607e..ee79f023f3 100644 --- a/app/Http/Controllers/Crud/JournalController.php +++ b/app/Http/Controllers/Crud/JournalController.php @@ -12,7 +12,7 @@ class JournalController extends CrudController { protected string $view = 'journals'; protected string $route = 'journals'; - protected $module = 'journals'; + protected string $module = 'journals'; protected string $model = Journal::class; diff --git a/app/Http/Controllers/Crud/LocationController.php b/app/Http/Controllers/Crud/LocationController.php index f17cae04c8..61246b1c76 100644 --- a/app/Http/Controllers/Crud/LocationController.php +++ b/app/Http/Controllers/Crud/LocationController.php @@ -12,7 +12,7 @@ class LocationController extends CrudController { protected string $view = 'locations'; protected string $route = 'locations'; - protected $module = 'locations'; + protected string $module = 'locations'; protected string $model = Location::class; diff --git a/app/Http/Controllers/Crud/MapController.php b/app/Http/Controllers/Crud/MapController.php index b5ae3f326e..9590782560 100644 --- a/app/Http/Controllers/Crud/MapController.php +++ b/app/Http/Controllers/Crud/MapController.php @@ -12,7 +12,7 @@ class MapController extends CrudController { protected string $view = 'maps'; protected string $route = 'maps'; - protected $module = 'maps'; + protected string $module = 'maps'; protected string $model = Map::class; diff --git a/app/Http/Controllers/Crud/NoteController.php b/app/Http/Controllers/Crud/NoteController.php index d930d5f7be..e07f38c20d 100644 --- a/app/Http/Controllers/Crud/NoteController.php +++ b/app/Http/Controllers/Crud/NoteController.php @@ -12,7 +12,7 @@ class NoteController extends CrudController { protected string $view = 'notes'; protected string $route = 'notes'; - protected $module = 'notes'; + protected string $module = 'notes'; protected string $model = Note::class; diff --git a/app/Http/Controllers/Crud/OrganisationController.php b/app/Http/Controllers/Crud/OrganisationController.php index e00fba8a89..8a63815b4f 100644 --- a/app/Http/Controllers/Crud/OrganisationController.php +++ b/app/Http/Controllers/Crud/OrganisationController.php @@ -12,7 +12,7 @@ class OrganisationController extends CrudController { protected string $view = 'organisations'; protected string $route = 'organisations'; - protected $module = 'organisations'; + protected string $module = 'organisations'; protected string $model = Organisation::class; diff --git a/app/Http/Controllers/Crud/QuestController.php b/app/Http/Controllers/Crud/QuestController.php index 49bca008c7..83d474437f 100644 --- a/app/Http/Controllers/Crud/QuestController.php +++ b/app/Http/Controllers/Crud/QuestController.php @@ -12,7 +12,7 @@ class QuestController extends CrudController { protected string $view = 'quests'; protected string $route = 'quests'; - protected $module = 'quests'; + protected string $module = 'quests'; protected string $model = Quest::class; diff --git a/app/Http/Controllers/Crud/RaceController.php b/app/Http/Controllers/Crud/RaceController.php index eb307a14f5..3e5515e61c 100644 --- a/app/Http/Controllers/Crud/RaceController.php +++ b/app/Http/Controllers/Crud/RaceController.php @@ -12,7 +12,7 @@ class RaceController extends CrudController { protected string $view = 'races'; protected string $route = 'races'; - protected $module = 'races'; + protected string $module = 'races'; protected string $model = Race::class; diff --git a/app/Http/Controllers/Crud/TagController.php b/app/Http/Controllers/Crud/TagController.php index 349fa6ae9f..6a8c49300a 100644 --- a/app/Http/Controllers/Crud/TagController.php +++ b/app/Http/Controllers/Crud/TagController.php @@ -12,7 +12,7 @@ class TagController extends CrudController { protected string $view = 'tags'; protected string $route = 'tags'; - protected $module = 'tags'; + protected string $module = 'tags'; protected string $model = Tag::class; diff --git a/app/Http/Controllers/Crud/TimelineController.php b/app/Http/Controllers/Crud/TimelineController.php index dadca08091..6907f6e6f3 100644 --- a/app/Http/Controllers/Crud/TimelineController.php +++ b/app/Http/Controllers/Crud/TimelineController.php @@ -17,7 +17,7 @@ class TimelineController extends CrudController protected string $filter = TimelineFilter::class; - protected $module = 'timelines'; + protected string $module = 'timelines'; /** */ diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index 77c791602d..d01482e2bb 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -47,6 +47,9 @@ class CrudController extends Controller /** Model class name for the object */ protected string $model; + /** Name of the campaign module to test if it's enabled or not */ + protected string $module; + protected string $filter; /** */ @@ -633,7 +636,7 @@ protected function authCheck($model) */ protected function moduleEnabled(): bool { - return empty($this->module) || $this->campaign->enabled($this->module); + return !isset($this->module) || $this->campaign->enabled($this->module); } /** From 52f47ef7cd91a53d569cb731dcbd650ee1445f62 Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 12:39:29 -0600 Subject: [PATCH 6/8] Preferred datagrid layout: only save non-default values to db --- app/Http/Controllers/CrudController.php | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index d01482e2bb..c304481e5f 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -682,7 +682,10 @@ protected function loadTemplates($model): Collection } elseif (!auth()->user()->can('create', $model)) { return new Collection(); } - return Entity::select('id', 'name', 'entity_id')->templates($model->entityTypeID())->get(); + return Entity::select('id', 'name', 'entity_id') + ->templates($model->entityTypeID()) + ->orderBy('name') + ->get(); } /** @@ -707,7 +710,11 @@ protected function mode(): string } else { $settings = auth()->user()->settings; if (auth()->check() && Arr::get($settings, $key) !== $newMode) { - $settings[$key] = $newMode; + if ($newMode === 'grid') { + unset($settings[$key]); + } else { + $settings[$key] = $newMode; + } auth()->user()->settings = $settings; auth()->user()->updateQuietly(); } @@ -739,7 +746,11 @@ protected function isNested(): bool $settings = auth()->user()->settings; if (auth()->check() && Arr::get($settings, $key) !== $new) { $settings = auth()->user()->settings; - $settings[$key] = $new; + if ($new) { + unset($settings[$key]); + } else { + $settings[$key] = false; + } auth()->user()->settings = $settings; auth()->user()->updateQuietly(); } From cf82b2e8b54246416855b2cc7a1c8d0d7d1ecbba Mon Sep 17 00:00:00 2001 From: ilestis Date: Mon, 8 Apr 2024 14:54:36 -0600 Subject: [PATCH 7/8] Preferred datagrid layout: only save non-default values to db --- app/Http/Controllers/CrudController.php | 6 ++---- .../views/cruds/datagrids/filters/datagrid-filter.blade.php | 2 +- resources/views/filters/form.blade.php | 4 ++-- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index c304481e5f..7a8cbd0624 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -138,8 +138,6 @@ public function crudIndex(Request $request) $bulk = $this->bulkModel(); $datagridActions = new $this->datagridActions(); $templates = $this->loadTemplates($model); - - // Determine if we're nested or not $nested = $this->isNested(); $base = $model @@ -151,7 +149,7 @@ public function crudIndex(Request $request) ; $parent = null; - if (request()->has('parent_id')) { + if (request()->has('parent_id') && method_exists($model, 'getParentKeyName')) { $parentKey = $model->getParentKeyName(); $base->where([$model->getTable() . '.' . $parentKey => request()->get('parent_id')]); @@ -726,7 +724,7 @@ protected function mode(): string return Session::get($key, 'grid'); } // Else use the user's preferred stacking for this entity type - return Arr::get(auth()->user()->settings, $key, true); + return Arr::get(auth()->user()->settings, $key, 'grid'); } /** * Determine if the current layout should be nested or not diff --git a/resources/views/cruds/datagrids/filters/datagrid-filter.blade.php b/resources/views/cruds/datagrids/filters/datagrid-filter.blade.php index 9425bce0fc..4c524cc118 100644 --- a/resources/views/cruds/datagrids/filters/datagrid-filter.blade.php +++ b/resources/views/cruds/datagrids/filters/datagrid-filter.blade.php @@ -18,7 +18,7 @@

@if ($activeFilters > 0) - + {{ __('crud.filters.clear') }} @endif diff --git a/resources/views/filters/form.blade.php b/resources/views/filters/form.blade.php index 4d454c16c2..70306e980d 100644 --- a/resources/views/filters/form.blade.php +++ b/resources/views/filters/form.blade.php @@ -20,7 +20,7 @@ @if ($field === 'attributes') @php $hasAttributeFilters = true @endphp - @continue + @continue @elseif ($field === 'connections') @php $hasConnectionFilters = true @endphp @continue @@ -81,7 +81,7 @@ @if ($activeFilters > 0) - + {{ __('crud.filters.mobile.clear') }} From fa53a79f3027427194361abca5fa253cbe08499e Mon Sep 17 00:00:00 2001 From: ilestis Date: Tue, 9 Apr 2024 09:15:40 -0600 Subject: [PATCH 8/8] Fix phpstan --- .../Api/v1/FullTextSearchApiController.php | 3 +++ app/Http/Controllers/CrudController.php | 4 ++-- .../Controllers/Search/FullTextController.php | 9 ++++----- app/Http/Controllers/SearchController.php | 4 +++- app/Models/Ability.php | 1 - app/Models/Attribute.php | 1 - app/Models/AttributeTemplate.php | 4 ---- app/Models/Bookmark.php | 1 - app/Models/Calendar.php | 1 - app/Models/CalendarWeather.php | 16 ++-------------- app/Models/Campaign.php | 1 - app/Models/CampaignBoost.php | 1 - app/Models/CampaignDashboardWidget.php | 1 - app/Models/CampaignFollower.php | 1 - app/Models/CampaignGenre.php | 1 - app/Models/CampaignInvite.php | 1 - app/Models/CampaignPermission.php | 1 - app/Models/CampaignRole.php | 1 - app/Models/CampaignRoleUser.php | 1 - app/Models/CampaignSetting.php | 1 - app/Models/CampaignUser.php | 1 - app/Models/Character.php | 1 - app/Models/CharacterFamily.php | 1 - app/Models/CharacterRace.php | 1 - app/Models/CharacterTrait.php | 1 - app/Models/Conversation.php | 1 - app/Models/ConversationMessage.php | 1 - app/Models/ConversationParticipant.php | 1 - app/Models/Creature.php | 1 - app/Models/CreatureLocation.php | 1 - app/Models/DiceRoll.php | 1 - app/Models/DiceRollResult.php | 1 - app/Models/Entity.php | 4 +--- app/Models/EntityEvent.php | 1 - app/Models/EntityFile.php | 1 - app/Models/EntityTag.php | 1 - app/Models/Event.php | 1 - app/Models/Family.php | 1 - app/Models/Item.php | 1 - app/Models/Journal.php | 1 - app/Models/Location.php | 1 - app/Models/Map.php | 5 ++--- app/Models/MapGroup.php | 1 - app/Models/MapLayer.php | 1 - app/Models/MapMarker.php | 1 - app/Models/Note.php | 1 - app/Models/Organisation.php | 1 - app/Models/OrganisationMember.php | 1 - app/Models/PasswordSecurity.php | 11 +++-------- app/Models/Post.php | 1 - app/Models/PostLayout.php | 1 - app/Models/Quest.php | 1 - app/Models/QuestElement.php | 1 - app/Models/Race.php | 1 - app/Models/RaceLocation.php | 1 - app/Models/Relation.php | 1 - app/Models/SubscriptionCancellation.php | 1 - app/Models/Tag.php | 2 -- app/Models/TimelineElement.php | 1 - app/Models/TimelineEra.php | 1 - app/Models/UserLog.php | 1 - app/Models/UserValidation.php | 1 - app/Services/BulkService.php | 1 - app/User.php | 5 ----- 64 files changed, 20 insertions(+), 100 deletions(-) diff --git a/app/Http/Controllers/Api/v1/FullTextSearchApiController.php b/app/Http/Controllers/Api/v1/FullTextSearchApiController.php index ea66227d49..d5ddfe467b 100644 --- a/app/Http/Controllers/Api/v1/FullTextSearchApiController.php +++ b/app/Http/Controllers/Api/v1/FullTextSearchApiController.php @@ -23,8 +23,11 @@ public function index(Campaign $campaign) { $this->authorize('access', $campaign); $term = request()->term; + $term2 = null; + /** @var Entity|null $entity */ $entity = Entity::where(['name' => request()->term, 'campaign_id' => $campaign->id])->first(); if ($entity) { + // @phpstan-ignore-next-line $term2 = $entity->type() . ':' . $entity->id; } diff --git a/app/Http/Controllers/CrudController.php b/app/Http/Controllers/CrudController.php index 7a8cbd0624..16883d3d68 100644 --- a/app/Http/Controllers/CrudController.php +++ b/app/Http/Controllers/CrudController.php @@ -106,7 +106,6 @@ public function crudIndex(Request $request) return redirect()->route('dashboard', $this->campaign)->with( 'error_raw', __('campaigns.settings.errors.module-disabled', [ - // @phpstan-ignore-next-line 'fix' => link_to_route('campaign.modules', __('crud.fix-this-issue'), ['#' . $this->module]), ]) ); @@ -116,9 +115,9 @@ public function crudIndex(Request $request) * Prepare a lot of variables that will be shared over to the view * @var MiscModel $model */ - $this->request = $request; $model = new $this->model(); $campaign = $this->campaign; + $this->request = $request; $this->filterService ->request($request); if (method_exists($model, 'explicitFilters')) { @@ -170,6 +169,7 @@ public function crudIndex(Request $request) } } } elseif ($nested) { + // @phpstan-ignore-next-line $base->whereNull($model->getTable() . '.' . $model->getParentKeyName()); } diff --git a/app/Http/Controllers/Search/FullTextController.php b/app/Http/Controllers/Search/FullTextController.php index 1ec674df28..2a3255c597 100644 --- a/app/Http/Controllers/Search/FullTextController.php +++ b/app/Http/Controllers/Search/FullTextController.php @@ -23,8 +23,10 @@ public function index(Campaign $campaign, Request $request) $term = request()->term; $term2 = null; + /** @var Entity|null $entity */ $entity = Entity::where('name', request()->term)->first(); if ($entity) { + // @phpstan-ignore-next-line $term2 = $entity->type() . ':' . $entity->id; } @@ -37,17 +39,16 @@ public function index(Campaign $campaign, Request $request) /** * Prepare a lot of variables that will be shared over to the view - * @var MiscModel $model */ - $name = 'characters'; + $name = 'entities'; $unfilteredCount = $base->count(); $models = $base->paginate(); //We get the entities here // If the current page is higher than the max amount of pages, redirect the user if ((int) request()->get('page', 1) > $models->lastPage()) { - return redirect()->route('search.fultext', [ + return redirect()->route('search.fulltext', [ $campaign, 'page' => $models->lastPage(), 'order' => request()->get('order') @@ -58,8 +59,6 @@ public function index(Campaign $campaign, Request $request) $forceMode = null; - //$actions = $this->navActions; - $data = compact( 'campaign', 'models', diff --git a/app/Http/Controllers/SearchController.php b/app/Http/Controllers/SearchController.php index 859d44751f..aa4f6783f5 100644 --- a/app/Http/Controllers/SearchController.php +++ b/app/Http/Controllers/SearchController.php @@ -6,8 +6,9 @@ use App\Models\Character; use App\Models\MiscModel; use App\Services\EntityService; -use Illuminate\Http\Request; use App\Services\FilterService; +use Illuminate\Database\Eloquent\Builder; +use Illuminate\Http\Request; class SearchController extends Controller { @@ -55,6 +56,7 @@ public function search(Request $request, Campaign $campaign) } /** @var MiscModel|Character $model */ $model = new $class(); + // @phpstan-ignore-next-line $results[$element] = $model->search($term)->limit(5)->get(); $active = count($results[$element]) > 0 && empty($active) ? $element : $active; $resultCount += count($results[$element]); diff --git a/app/Models/Ability.php b/app/Models/Ability.php index 105bb5a57e..ae39e8ffd4 100644 --- a/app/Models/Ability.php +++ b/app/Models/Ability.php @@ -40,7 +40,6 @@ class Ability extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/Attribute.php b/app/Models/Attribute.php index 4abd8343aa..fd7d07cb69 100644 --- a/app/Models/Attribute.php +++ b/app/Models/Attribute.php @@ -55,7 +55,6 @@ class Attribute extends Model public const TYPE_NUMBER_ID = 6; public const TYPE_LIST_ID = 7; - /** @var string[] */ protected $fillable = [ 'entity_id', 'name', diff --git a/app/Models/AttributeTemplate.php b/app/Models/AttributeTemplate.php index 4741e7beb1..0a31e16f85 100644 --- a/app/Models/AttributeTemplate.php +++ b/app/Models/AttributeTemplate.php @@ -30,10 +30,6 @@ class AttributeTemplate extends MiscModel use HasRecursiveRelationships; use SoftDeletes; - /** - * Fields that can be mass-assigned - * @var string[] - */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/Bookmark.php b/app/Models/Bookmark.php index 57384658b5..4e2ca7b7ae 100644 --- a/app/Models/Bookmark.php +++ b/app/Models/Bookmark.php @@ -48,7 +48,6 @@ class Bookmark extends MiscModel use Privatable; use Taggable; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'entity_id', diff --git a/app/Models/Calendar.php b/app/Models/Calendar.php index cda75cd082..0d5a2bb8f2 100644 --- a/app/Models/Calendar.php +++ b/app/Models/Calendar.php @@ -47,7 +47,6 @@ class Calendar extends MiscModel use HasRecursiveRelationships; use SoftDeletes; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/CalendarWeather.php b/app/Models/CalendarWeather.php index 848b8b4d97..53d27c0b0e 100644 --- a/app/Models/CalendarWeather.php +++ b/app/Models/CalendarWeather.php @@ -6,6 +6,7 @@ use App\Models\Scopes\CalendarWeatherScopes; use App\Traits\VisibilityIDTrait; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; /** * Class CalendarWeather @@ -30,14 +31,8 @@ class CalendarWeather extends Model use CalendarWeatherScopes; use VisibilityIDTrait; - /** - * @var string - */ public $table = 'calendar_weather'; - /** - * @var string[] - */ public $fillable = [ 'calendar_id', 'weather', @@ -52,16 +47,11 @@ class CalendarWeather extends Model 'name', ]; - /** - * @return \Illuminate\Database\Eloquent\Relations\BelongsTo - */ - public function calendar() + public function calendar(): BelongsTo { return $this->belongsTo(Calendar::class); } - /** - */ public function tooltip(): string { return @@ -72,8 +62,6 @@ public function tooltip(): string ; } - /** - */ public function weatherName(): string { if (!empty($this->name)) { diff --git a/app/Models/Campaign.php b/app/Models/Campaign.php index 13244e1989..6e3f4b88ea 100644 --- a/app/Models/Campaign.php +++ b/app/Models/Campaign.php @@ -80,7 +80,6 @@ class Campaign extends Model public const LAYER_COUNT_MIN = 1; public const LAYER_COUNT_MAX = 10; - /** @var string[] */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/CampaignBoost.php b/app/Models/CampaignBoost.php index 3e5ede825e..e2a5a9aea0 100644 --- a/app/Models/CampaignBoost.php +++ b/app/Models/CampaignBoost.php @@ -25,7 +25,6 @@ class CampaignBoost extends Model use Prunable; use SoftDeletes; - /** @var string[] */ protected $fillable = ['user_id', 'campaign_id']; /** diff --git a/app/Models/CampaignDashboardWidget.php b/app/Models/CampaignDashboardWidget.php index 35163d8da5..ea5b86ff73 100644 --- a/app/Models/CampaignDashboardWidget.php +++ b/app/Models/CampaignDashboardWidget.php @@ -40,7 +40,6 @@ class CampaignDashboardWidget extends Model use LastSync; use Taggable; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'entity_id', diff --git a/app/Models/CampaignFollower.php b/app/Models/CampaignFollower.php index 71349dbce8..67c8803bf5 100644 --- a/app/Models/CampaignFollower.php +++ b/app/Models/CampaignFollower.php @@ -24,7 +24,6 @@ class CampaignFollower extends Pivot */ public $table = 'campaign_followers'; - /** @var string[] */ protected $fillable = ['user_id', 'campaign_id']; /** diff --git a/app/Models/CampaignGenre.php b/app/Models/CampaignGenre.php index 309c15e255..412c6d4e86 100644 --- a/app/Models/CampaignGenre.php +++ b/app/Models/CampaignGenre.php @@ -20,7 +20,6 @@ class CampaignGenre extends Pivot */ public $table = 'campaign_genre'; - /** @var string[] */ protected $fillable = ['campaign_id', 'genre_id']; /** diff --git a/app/Models/CampaignInvite.php b/app/Models/CampaignInvite.php index 8cadbf5a85..f0dfaf86e4 100644 --- a/app/Models/CampaignInvite.php +++ b/app/Models/CampaignInvite.php @@ -21,7 +21,6 @@ class CampaignInvite extends MiscModel */ public $table = 'campaign_invites'; - /** @var string[] */ protected $fillable = [ 'role_id', 'campaign_id', diff --git a/app/Models/CampaignPermission.php b/app/Models/CampaignPermission.php index 32d630329b..d76e831658 100644 --- a/app/Models/CampaignPermission.php +++ b/app/Models/CampaignPermission.php @@ -51,7 +51,6 @@ class CampaignPermission extends Model protected array $cachedSegments; - /** @var string[] */ protected $fillable = [ 'campaign_role_id', 'campaign_id', diff --git a/app/Models/CampaignRole.php b/app/Models/CampaignRole.php index 8992160c8a..9af11e6af5 100644 --- a/app/Models/CampaignRole.php +++ b/app/Models/CampaignRole.php @@ -33,7 +33,6 @@ class CampaignRole extends Model use Paginatable; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'is_admin', diff --git a/app/Models/CampaignRoleUser.php b/app/Models/CampaignRoleUser.php index 03ad7685e7..ba4ef42ebd 100644 --- a/app/Models/CampaignRoleUser.php +++ b/app/Models/CampaignRoleUser.php @@ -21,7 +21,6 @@ */ class CampaignRoleUser extends Model { - /** @var string[] */ protected $fillable = [ 'campaign_role_id', 'user_id', diff --git a/app/Models/CampaignSetting.php b/app/Models/CampaignSetting.php index 62fcefbdca..0bb4fd73be 100644 --- a/app/Models/CampaignSetting.php +++ b/app/Models/CampaignSetting.php @@ -11,7 +11,6 @@ class CampaignSetting extends Model */ public $table = 'campaign_settings'; - /** @var string[] */ protected $fillable = [ 'abilities', 'campaign_id', diff --git a/app/Models/CampaignUser.php b/app/Models/CampaignUser.php index 5c81879329..4d0fcdd521 100644 --- a/app/Models/CampaignUser.php +++ b/app/Models/CampaignUser.php @@ -31,7 +31,6 @@ class CampaignUser extends Pivot protected array $sortable = ['user.name', 'created_at', 'last_login']; - /** @var string[] */ protected $fillable = ['user_id', 'campaign_id']; /** diff --git a/app/Models/Character.php b/app/Models/Character.php index a4af16645f..cf869f0d1a 100644 --- a/app/Models/Character.php +++ b/app/Models/Character.php @@ -49,7 +49,6 @@ class Character extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/CharacterFamily.php b/app/Models/CharacterFamily.php index 4f8a4ee041..0dc2f412f5 100644 --- a/app/Models/CharacterFamily.php +++ b/app/Models/CharacterFamily.php @@ -14,7 +14,6 @@ */ class CharacterFamily extends Model { - /** @var string[] */ protected $fillable = [ 'character_id', 'family_id', diff --git a/app/Models/CharacterRace.php b/app/Models/CharacterRace.php index 7e12c6b507..e45910d840 100644 --- a/app/Models/CharacterRace.php +++ b/app/Models/CharacterRace.php @@ -12,7 +12,6 @@ class CharacterRace extends Model { public $table = 'character_race'; - /** @var string[] */ protected $fillable = [ 'character_id', 'race_id', diff --git a/app/Models/CharacterTrait.php b/app/Models/CharacterTrait.php index 601dc0295b..f42a6fa6fd 100644 --- a/app/Models/CharacterTrait.php +++ b/app/Models/CharacterTrait.php @@ -25,7 +25,6 @@ class CharacterTrait extends Model public const SECTION_APPEARANCE = 1; public const SECTION_PERSONALITY = 2; - /** @var string[] */ protected $fillable = [ 'character_id', 'name', diff --git a/app/Models/Conversation.php b/app/Models/Conversation.php index 017bc8b5f5..1302bbdbbc 100644 --- a/app/Models/Conversation.php +++ b/app/Models/Conversation.php @@ -27,7 +27,6 @@ class Conversation extends MiscModel use HasFilters; use SoftDeletes; - /** @var string[] */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/ConversationMessage.php b/app/Models/ConversationMessage.php index a3b7e4859d..80bcae236c 100644 --- a/app/Models/ConversationMessage.php +++ b/app/Models/ConversationMessage.php @@ -32,7 +32,6 @@ class ConversationMessage extends MiscModel public $isGroupped = false; - /** @var string[] */ protected $fillable = [ 'conversation_id', 'created_by', diff --git a/app/Models/ConversationParticipant.php b/app/Models/ConversationParticipant.php index 029df17123..1ff98c9418 100644 --- a/app/Models/ConversationParticipant.php +++ b/app/Models/ConversationParticipant.php @@ -24,7 +24,6 @@ class ConversationParticipant extends MiscModel */ protected $loadedEntity = false; - /** @var string[] */ protected $fillable = [ 'conversation_id', 'created_by', diff --git a/app/Models/Creature.php b/app/Models/Creature.php index 038a7eb801..ba617faddd 100644 --- a/app/Models/Creature.php +++ b/app/Models/Creature.php @@ -39,7 +39,6 @@ class Creature extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'campaign_id', diff --git a/app/Models/CreatureLocation.php b/app/Models/CreatureLocation.php index a1228667b4..72f316bcce 100644 --- a/app/Models/CreatureLocation.php +++ b/app/Models/CreatureLocation.php @@ -23,7 +23,6 @@ class CreatureLocation extends Pivot */ public $table = 'creature_location'; - /** @var string[] */ protected $fillable = ['creature_id', 'location_id']; /** diff --git a/app/Models/DiceRoll.php b/app/Models/DiceRoll.php index 300c2edbc7..35099c94d5 100644 --- a/app/Models/DiceRoll.php +++ b/app/Models/DiceRoll.php @@ -22,7 +22,6 @@ class DiceRoll extends MiscModel use HasFilters; use SoftDeletes; - /** @var string[] */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/DiceRollResult.php b/app/Models/DiceRollResult.php index 799ab797a0..47f6aefca7 100644 --- a/app/Models/DiceRollResult.php +++ b/app/Models/DiceRollResult.php @@ -12,7 +12,6 @@ class DiceRollResult extends MiscModel use HasFilters; - /** @var string[] */ protected $fillable = [ 'dice_roll_id', 'created_by', diff --git a/app/Models/Entity.php b/app/Models/Entity.php index c584fdc960..4938c8a74b 100644 --- a/app/Models/Entity.php +++ b/app/Models/Entity.php @@ -68,7 +68,6 @@ class Entity extends Model use SortableTrait; use TooltipTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'entity_id', @@ -240,9 +239,8 @@ public function entityType(): string } /** - * @param array|int $types */ - public function isType($types): bool + public function isType(array|int $types): bool { if (!is_array($types)) { $types = [$types]; diff --git a/app/Models/EntityEvent.php b/app/Models/EntityEvent.php index f1a188067d..7ead8db2d6 100644 --- a/app/Models/EntityEvent.php +++ b/app/Models/EntityEvent.php @@ -47,7 +47,6 @@ class EntityEvent extends MiscModel /** @var string|null Cached readable date */ protected string|null $readableDate = null; - /** @var string[] */ protected $fillable = [ 'calendar_id', 'entity_id', diff --git a/app/Models/EntityFile.php b/app/Models/EntityFile.php index 91b648fc74..4b0c5f0647 100644 --- a/app/Models/EntityFile.php +++ b/app/Models/EntityFile.php @@ -28,7 +28,6 @@ class EntityFile extends Model use EntityAsset; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'entity_id', 'name', diff --git a/app/Models/EntityTag.php b/app/Models/EntityTag.php index 44b9cc4516..3fedf5ca79 100644 --- a/app/Models/EntityTag.php +++ b/app/Models/EntityTag.php @@ -18,7 +18,6 @@ class EntityTag extends Model { use HasFactory; - /** @var string[] */ protected $fillable = [ 'entity_id', 'tag_id', diff --git a/app/Models/Event.php b/app/Models/Event.php index c3c386f96c..7998fc524e 100644 --- a/app/Models/Event.php +++ b/app/Models/Event.php @@ -38,7 +38,6 @@ class Event extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/Family.php b/app/Models/Family.php index 013595bc7e..0b5eef0b67 100644 --- a/app/Models/Family.php +++ b/app/Models/Family.php @@ -37,7 +37,6 @@ class Family extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/Item.php b/app/Models/Item.php index d16fe93eb3..4ed719212c 100644 --- a/app/Models/Item.php +++ b/app/Models/Item.php @@ -37,7 +37,6 @@ class Item extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'campaign_id', diff --git a/app/Models/Journal.php b/app/Models/Journal.php index 4663801aed..09d97bf92c 100644 --- a/app/Models/Journal.php +++ b/app/Models/Journal.php @@ -41,7 +41,6 @@ class Journal extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'campaign_id', diff --git a/app/Models/Location.php b/app/Models/Location.php index 9d3d2cacaf..a9d020e01c 100644 --- a/app/Models/Location.php +++ b/app/Models/Location.php @@ -47,7 +47,6 @@ class Location extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'slug', diff --git a/app/Models/Map.php b/app/Models/Map.php index c68cae0caa..ddef91df93 100644 --- a/app/Models/Map.php +++ b/app/Models/Map.php @@ -67,7 +67,6 @@ class Map extends MiscModel public const CHUNKING_FINISHED = 2; public const CHUNKING_ERROR = 3; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', @@ -602,8 +601,8 @@ protected function prepareBounds(): void $height = $xml->attributes()->height; } else { $image = imagecreatefromstring($contents); - $width = imagesx($image) ?? null; - $height = imagesy($image) ?? null; + $width = imagesx($image); + $height = imagesy($image); } $this->height = $height; diff --git a/app/Models/MapGroup.php b/app/Models/MapGroup.php index 2d466f884f..41968c4d49 100644 --- a/app/Models/MapGroup.php +++ b/app/Models/MapGroup.php @@ -38,7 +38,6 @@ class MapGroup extends Model 'position', ]; - /** @var string[] */ protected $fillable = [ 'map_id', 'name', diff --git a/app/Models/MapLayer.php b/app/Models/MapLayer.php index 879c0ce9bf..81ac884b6b 100644 --- a/app/Models/MapLayer.php +++ b/app/Models/MapLayer.php @@ -38,7 +38,6 @@ class MapLayer extends Model use SortableTrait; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'map_id', 'name', diff --git a/app/Models/MapMarker.php b/app/Models/MapMarker.php index ce9aa0425b..fbb4239f04 100644 --- a/app/Models/MapMarker.php +++ b/app/Models/MapMarker.php @@ -57,7 +57,6 @@ class MapMarker extends Model public const SHAPE_CIRCLE = 3; public const SHAPE_POLY = 5; - /** @var string[] */ protected $fillable = [ 'map_id', 'name', diff --git a/app/Models/Note.php b/app/Models/Note.php index b28d841b78..6c22ea79b3 100644 --- a/app/Models/Note.php +++ b/app/Models/Note.php @@ -30,7 +30,6 @@ class Note extends MiscModel use HasRecursiveRelationships; use SoftDeletes; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php index e77842ec18..819234a7b1 100644 --- a/app/Models/Organisation.php +++ b/app/Models/Organisation.php @@ -38,7 +38,6 @@ class Organisation extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'name', diff --git a/app/Models/OrganisationMember.php b/app/Models/OrganisationMember.php index 17cd086376..f34a1ed3cc 100644 --- a/app/Models/OrganisationMember.php +++ b/app/Models/OrganisationMember.php @@ -48,7 +48,6 @@ class OrganisationMember extends Model protected $filterableColumns = ['organisation_id']; - /** @var string[] */ protected $fillable = [ 'organisation_id', 'character_id', diff --git a/app/Models/PasswordSecurity.php b/app/Models/PasswordSecurity.php index 776778c994..c496f99cec 100644 --- a/app/Models/PasswordSecurity.php +++ b/app/Models/PasswordSecurity.php @@ -3,6 +3,7 @@ namespace App\Models; use Illuminate\Database\Eloquent\Model; +use Illuminate\Database\Eloquent\Relations\BelongsTo; use PragmaRX\Google2FA\Google2FA; use Illuminate\Support\Facades\Auth; use BaconQrCode\Renderer\ImageRenderer; @@ -14,11 +15,6 @@ class PasswordSecurity extends Model { protected $table = 'password_securities'; - /** - * The attributes that are mass assignable. - * - * @var string[] - */ protected $fillable = [ 'user_id', 'google2fa_enable', @@ -28,7 +24,7 @@ class PasswordSecurity extends Model /** * A Google2FA belongsTo a user */ - public function user() + public function user(): BelongsTo { return $this->belongsTo('App\User'); } @@ -66,7 +62,6 @@ public function getGoogleQR() ); $writer = new Writer($renderer); - $qrImage = $writer->writeString($google2FaUrl); - return $qrImage; + return $writer->writeString($google2FaUrl); } } diff --git a/app/Models/Post.php b/app/Models/Post.php index b94c0992c4..eec6bc0be7 100644 --- a/app/Models/Post.php +++ b/app/Models/Post.php @@ -51,7 +51,6 @@ class Post extends Model use Searchable; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'entity_id', 'name', diff --git a/app/Models/PostLayout.php b/app/Models/PostLayout.php index 75ad088790..1c415380a4 100644 --- a/app/Models/PostLayout.php +++ b/app/Models/PostLayout.php @@ -18,7 +18,6 @@ */ class PostLayout extends Model { - /** @var string[] */ protected $fillable = [ 'code', 'entity_type_id', diff --git a/app/Models/Quest.php b/app/Models/Quest.php index 85a32292f6..6a1e1b0178 100644 --- a/app/Models/Quest.php +++ b/app/Models/Quest.php @@ -41,7 +41,6 @@ class Quest extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'quest_id', diff --git a/app/Models/QuestElement.php b/app/Models/QuestElement.php index 7f36f86fe6..711893ef8d 100644 --- a/app/Models/QuestElement.php +++ b/app/Models/QuestElement.php @@ -35,7 +35,6 @@ class QuestElement extends Model use SimpleSortableTrait; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'quest_id', 'name', diff --git a/app/Models/Race.php b/app/Models/Race.php index 3e6986f72f..f9269429b9 100644 --- a/app/Models/Race.php +++ b/app/Models/Race.php @@ -38,7 +38,6 @@ class Race extends MiscModel use SoftDeletes; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'name', 'campaign_id', diff --git a/app/Models/RaceLocation.php b/app/Models/RaceLocation.php index 12fe6efa9f..d968928134 100644 --- a/app/Models/RaceLocation.php +++ b/app/Models/RaceLocation.php @@ -23,7 +23,6 @@ class RaceLocation extends Pivot */ public $table = 'race_location'; - /** @var string[] */ protected $fillable = ['race_id', 'location_id']; /** diff --git a/app/Models/Relation.php b/app/Models/Relation.php index cc032995d9..06d3305a3c 100644 --- a/app/Models/Relation.php +++ b/app/Models/Relation.php @@ -49,7 +49,6 @@ class Relation extends Model use SortableTrait; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'campaign_id', 'owner_id', diff --git a/app/Models/SubscriptionCancellation.php b/app/Models/SubscriptionCancellation.php index 19fecfcb25..0156ab0e18 100644 --- a/app/Models/SubscriptionCancellation.php +++ b/app/Models/SubscriptionCancellation.php @@ -24,7 +24,6 @@ class SubscriptionCancellation extends Model */ public $table = 'subscription_cancellations'; - /** @var string[] */ protected $fillable = [ 'user_id', 'reason', diff --git a/app/Models/Tag.php b/app/Models/Tag.php index 372cde4771..8b440f63c3 100644 --- a/app/Models/Tag.php +++ b/app/Models/Tag.php @@ -69,7 +69,6 @@ class Tag extends MiscModel 'is_hidden', ]; - /** @var string[] */ protected $fillable = [ 'name', 'slug', @@ -184,7 +183,6 @@ public function allChildren(bool $withTags = false) foreach ($this->entities->pluck('id')->toArray() as $entity) { $children[] = $entity; } - // @phpstan-ignore-next-line foreach ($this->descendants as $desc) { foreach ($desc->entities()->pluck('entities.id')->toArray() as $entity) { $children[] = $entity; diff --git a/app/Models/TimelineElement.php b/app/Models/TimelineElement.php index 31fe092d49..b6a546566d 100644 --- a/app/Models/TimelineElement.php +++ b/app/Models/TimelineElement.php @@ -43,7 +43,6 @@ class TimelineElement extends Model use Searchable; use VisibilityIDTrait; - /** @var string[] */ protected $fillable = [ 'timeline_id', 'era_id', diff --git a/app/Models/TimelineEra.php b/app/Models/TimelineEra.php index d04130039d..ca54cfb31a 100644 --- a/app/Models/TimelineEra.php +++ b/app/Models/TimelineEra.php @@ -35,7 +35,6 @@ class TimelineEra extends Model use HasFactory; use SortableTrait; - /** @var string[] */ protected $fillable = [ 'timeline_id', 'name', diff --git a/app/Models/UserLog.php b/app/Models/UserLog.php index db22714ea9..7c4fff079e 100644 --- a/app/Models/UserLog.php +++ b/app/Models/UserLog.php @@ -77,7 +77,6 @@ class UserLog extends Model */ public $table = 'user_logs'; - /** @var string[] */ protected $fillable = [ 'user_id', 'type_id', diff --git a/app/Models/UserValidation.php b/app/Models/UserValidation.php index 170c567c42..892582d6f3 100644 --- a/app/Models/UserValidation.php +++ b/app/Models/UserValidation.php @@ -20,7 +20,6 @@ class UserValidation extends Model { use Prunable; - /** @var string[] */ protected $fillable = [ 'is_valid', 'token' diff --git a/app/Services/BulkService.php b/app/Services/BulkService.php index 686994a24d..415ff24abf 100644 --- a/app/Services/BulkService.php +++ b/app/Services/BulkService.php @@ -357,7 +357,6 @@ public function editing(array $fields, Bulk $bulk): int continue; } - /** @var Collection $existingTags */ $tagAction = Arr::get($fields, 'bulk-tagging', 'add'); if ($tagAction === 'remove') { $entity->entity->tags()->detach($tagIds); diff --git a/app/User.php b/app/User.php index 14b03a847b..58c61f9562 100644 --- a/app/User.php +++ b/app/User.php @@ -74,11 +74,6 @@ class User extends \Illuminate\Foundation\Auth\User use UserSetting; use UserTokens; - /** - * The attributes that are mass assignable. - * - * @var string[] - */ protected $fillable = [ 'name', 'email',