Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix server error in the dashboard when a nested module has a deleted parent #2633

Merged
merged 2 commits into from
Oct 14, 2024
Merged

Fix server error in the dashboard when a nested module has a deleted parent #2633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcaf53d
Fix server error in the dashboard when a nested module has a deleted …
Tofandel Jul 11, 2024
2f63b55
Merge branch '3.x' into fix/dashboard-nested-error
ifox Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 32 additions & 11 deletions src/Http/Controllers/Admin/DashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use Illuminate\Contracts\Auth\Factory as AuthFactory;
use Illuminate\Contracts\Foundation\Application;
use Illuminate\Contracts\View\View;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\Relation;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -120,7 +121,11 @@ public function search(Request $request): Collection
})->map(function ($module) use ($request) {
$repository = $this->getRepository($module['name'], $module['repository'] ?? null);

$found = $repository->cmsSearch($request->get('search'), $module['search_fields'] ?? ['title'])->take(10);
$found = $repository->cmsSearch(
$request->get('search'),
$module['search_fields'] ?? ['title'],
isset($module['parentRelationship']) ? fn($q) => $q->whereHas($module['parentRelationship']) : null
)->take(10);

return $found->map(function ($item) use ($module) {
try {
Expand All @@ -136,16 +141,19 @@ public function search(Request $request): Collection
$date = $item->created_at->toIso8601String();
}

$parentRelationship = $module['parentRelationship'] ?? null;
$parent = $item->$parentRelationship;
if (isset($module['parentRelationship'])) {
/** @var BelongsTo $parent */
$parent = call_user_func([$item, $module['parentRelationship']]);
$parent_id = $parent->getParentKey();
}

return [
'id' => $item->id,
'href' => moduleRoute(
$module['name'],
$module['routePrefix'] ?? null,
'edit',
array_merge($parentRelationship ? [$parent->id] : [], [$item->id])
array_filter([$parent_id ?? null, $item->id])
),
'thumbnail' => method_exists($item, 'defaultCmsImage') ? $item->defaultCmsImage(['w' => 100, 'h' => 100]) : null,
'published' => $item->published,
Expand Down Expand Up @@ -251,8 +259,16 @@ private function formatActivity(Activity $activity): ?array
return null;
}

$parentRelationship = $dashboardModule['parentRelationship'] ?? null;
$parent = $activity->subject->$parentRelationship;
if (isset($dashboardModule['parentRelationship'])) {
/** @var BelongsTo $parent */
$parent = call_user_func([$activity->subject, $dashboardModule['parentRelationship']]);
$parent_id = $parent->getParentKey();

if (empty($parent_id)) {
// Prevent module route error
return null;
}
}

// @todo: Improve readability of what is happening here.
return [
Expand All @@ -269,7 +285,7 @@ private function formatActivity(Activity $activity): ?array
$dashboardModule['name'],
$dashboardModule['routePrefix'] ?? null,
'edit',
array_merge($parentRelationship ? [$parent->id] : [], [$activity->subject_id])
array_filter([$parent_id ?? null, $activity->subject_id])
),
] : []) + (! is_null($activity->subject->published) ? [
'published' => $activity->description === 'published' ? true : ($activity->description === 'unpublished' ? false : $activity->subject->published),
Expand Down Expand Up @@ -554,10 +570,15 @@ private function getDrafts(Collection $modules): Collection
if ($repository->hasBehavior('revisions')) {
$query->mine();
}
$parentRelationship = $module['parentRelationship'] ?? null;

return $query->get()->map(function ($draft) use ($module, $parentRelationship) {
$parent = $draft->$parentRelationship;
if (isset($module['parentRelationship'])) {
$query->whereHas($module['parentRelationship']);
}

return $query->get()->map(function ($draft) use ($module) {
if (isset($module['parentRelationship'])) {
$parent_id = call_user_func([$draft, $module['parentRelationship']])->getParentKey();
}

return [
'type' => ucfirst($module['label_singular'] ?? Str::singular($module['name'])),
Expand All @@ -566,7 +587,7 @@ private function getDrafts(Collection $modules): Collection
$module['name'],
$module['routePrefix'] ?? null,
'edit',
array_merge($parentRelationship ? [$parent->id] : [], [$draft->id])
array_filter([$parent_id ?? null, $draft->id])
)
];
});
Expand Down
18 changes: 8 additions & 10 deletions src/Repositories/ModuleRepository.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
use A17\Twill\Repositories\Behaviors\HandlePermissions;
use A17\Twill\Repositories\Behaviors\HandleRelatedBrowsers;
use A17\Twill\Repositories\Behaviors\HandleRepeaters;
use A17\Twill\Services\Listings\Filters\FreeTextSearch;
use Exception;
use Illuminate\Contracts\Pagination\LengthAwarePaginator;
use Illuminate\Database\Eloquent\Builder;
Expand Down Expand Up @@ -152,19 +153,16 @@ public function listAll(
return $query->get()->pluck($column, $pluckBy);
}

public function cmsSearch(string $search, array $fields = []): Collection
public function cmsSearch(string $search, array $fields = [], callable $query = null): Collection
{
$builder = $this->model->latest();
$searchFilter = new FreeTextSearch();
$searchFilter->queryString($search);
$searchFilter->searchColumns($fields);
$searchFilter->searchQuery($query);

$translatedAttributes = $this->model->getTranslatedAttributes() ?? [];
$builder = $this->model->latest();

foreach ($fields as $field) {
if (in_array($field, $translatedAttributes, true)) {
$builder->orWhereTranslationLike($field, "%$search%");
} else {
$builder->orWhere($field, getLikeOperator(), "%$search%");
}
}
$searchFilter->applyFilter($builder);

return $builder->get();
}
Expand Down
Loading