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

Collection & Morphable pivot table support #537

Open
wants to merge 9 commits into
base: 3.x
Choose a base branch
from
+123 −10
Open

Collection & Morphable pivot table support #537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
1f3aae8
Fixes #529
GeorgeFourkas Aug 30, 2024
116ff76
Merge remote-tracking branch 'origin/3.x' into 3.x
GeorgeFourkas Aug 30, 2024
826a37b
Format Code
GeorgeFourkas Aug 30, 2024
fbd7e59
merge
GeorgeFourkas Aug 30, 2024
c0c18ee
Merge remote-tracking branch 'origin/3.x' into 3.x
GeorgeFourkas Aug 30, 2024
9a2efbc
Format Code
GeorgeFourkas Aug 30, 2024
c2888ce
Fixes #529
GeorgeFourkas Aug 30, 2024
b116bec
Format Code
GeorgeFourkas Aug 30, 2024
57f0016
fixes #529
GeorgeFourkas Aug 30, 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
2 changes: 1 addition & 1 deletion config/curator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,10 @@
'fallbacks' => [],
'route_path' => 'curator',
],
'intermediate_model' => null,
'image_crop_aspect_ratio' => null,
'image_resize_mode' => null,
'image_resize_target_height' => null,
'image_resize_target_width' => null,
'is_limited_to_directory' => false,
'is_tenant_aware' => true,
'tenant_ownership_relationship_name' => 'tenant',
Expand Down
101 changes: 94 additions & 7 deletions src/Components/Forms/CuratorPicker.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Database\Eloquent\Relations\MorphOne;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\App;
use Illuminate\Support\Facades\Storage;
Expand Down Expand Up @@ -54,6 +55,8 @@ class CuratorPicker extends Field

protected ?string $orderColumn = null;

protected ?string $collection = null;

protected ?string $typeColumn = null;

protected ?string $typeValue = null;
Expand Down Expand Up @@ -194,12 +197,17 @@ public function getTypeColumn(): string
return $this->typeColumn ?? 'type';
}

public function getCollection()
{
return $this->collection ?? null;
}

public function getTypeValue(): ?string
{
return $this->typeValue ?? null;
}

public function getRelationship(): BelongsTo | BelongsToMany | MorphMany | null
public function getRelationship(): BelongsTo | BelongsToMany | MorphMany | MorphOne | null
{
$name = $this->getRelationshipName();

Expand Down Expand Up @@ -435,6 +443,13 @@ public function typeColumn(string $column): static
return $this;
}

public function collection(string $collection)
{
$this->collection = $collection;

return $this;
}

public function typeValue(string $value): static
{
$this->typeValue = $value;
Expand All @@ -458,11 +473,18 @@ public function relationship(string | Closure $relationshipName, string | Closur
if ($relationship instanceof MorphMany) {
$typeColumn = $component->getTypeColumn();
$typeValue = $component->getTypeValue();
$collection = $component->getCollection();

$query = $relationship->with('media');
if ($typeColumn && $typeValue) {
$query->where($typeColumn, $typeValue);
}

if ($collection) {

$query->where('collection', $collection);
}

$relatedMediaItems = $query->get();

$relatedMedia = $relatedMediaItems->map(function ($item) {
Expand All @@ -480,6 +502,32 @@ public function relationship(string | Closure $relationshipName, string | Closur
return;
}

if ($relationship instanceof MorphOne) {

$typeColumn = $component->getTypeColumn();
$typeValue = $component->getTypeValue();
$collection = $component->getCollection();

$query = $relationship->with('media');
if ($typeColumn && $typeValue) {
$query->where($typeColumn, $typeValue);
}

if ($collection) {
$query->where('collection', $collection);
}

$relatedMediaItems = $query->get();

$relatedMedia = $relatedMediaItems->map(function ($item) {
return $item->media->toArray();
})->toArray();

$component->state($relatedMedia);

return;
}

/** @var BelongsTo $relationship */
$relatedModel = $relationship->getResults();

Expand Down Expand Up @@ -525,10 +573,11 @@ public function relationship(string | Closure $relationshipName, string | Closur
$orderColumn = $component->getOrderColumn();
$typeColumn = $component->getTypeColumn();
$typeValue = $component->getTypeValue();
$existingItems = $component->getRelationship()->where($typeColumn, $typeValue)->get()->keyBy('media_id')->toArray();
$collection = $component->getCollection();
$existingItems = $relationship->where($typeColumn, $typeValue)->get()->keyBy('media_id')->toArray();
$newIds = collect($state)->pluck('id')->toArray();

$component->getRelationship()->whereNotIn('media_id', $newIds)
$relationship->whereNotIn('media_id', $newIds)
->where($typeColumn, $typeValue)
->delete();

Expand All @@ -538,15 +587,17 @@ public function relationship(string | Closure $relationshipName, string | Closur
$data = [
'media_id' => $itemId,
$orderColumn => $i,
'collection' => $collection,
];
if ($typeValue) {
$data[$typeColumn] = $typeValue;
}
if ($collection) {
$data['collection'] = $collection;
}

if (isset($existingItems[$itemId])) {
$component->getRelationship()
->where('media_id', $itemId)
->where($typeColumn, $typeValue)
->update($data);
$relationship->where('media_id', $itemId)->update($data);
} else {
$relationship->create($data);
}
Expand All @@ -557,6 +608,42 @@ public function relationship(string | Closure $relationshipName, string | Closur
}
}

if ($relationship instanceof MorphOne) {
$orderColumn = $component->getOrderColumn();
$typeColumn = $component->getTypeColumn();
$typeValue = $component->getTypeValue();
$collection = $component->getCollection();
$existingItems = $relationship->where($typeColumn, $typeValue)->get()->keyBy('media_id')->toArray();
$newIds = collect($state)->pluck('id')->toArray();

$relationship->whereNotIn('media_id', $newIds)
->where($typeColumn, $typeValue)
->delete();

$i = count($existingItems) + 1;

foreach ($state as $item) {
$itemId = $item['id'];
$data = [
'media_id' => $itemId,
'collection' => $collection,
$orderColumn => $i,
];
if ($typeValue) {
$data[$typeColumn] = $typeValue;
}

if (isset($existingItems[$itemId])) {
$relationship->where('media_id', $itemId)->update($data);
} else {
$relationship->create($data);
}
$i++;
}

return;
}

if (blank($state) && $relationship->exists()) {
$relationship->disassociate();

Expand Down
11 changes: 10 additions & 1 deletion src/Components/Tables/CuratorColumn.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Illuminate\Support\Arr;

use function Awcodes\Curator\get_media_items;
use function Awcodes\Curator\is_related_to_media_through_pivot;

class CuratorColumn extends ImageColumn
{
Expand All @@ -26,7 +27,15 @@ public function getMedia(): Media | Collection | array | null
$state = $this->getState();

if (is_a($state, Collection::class)) {
return $state->take($this->limit);
$state = $state->take($this->limit);

if (! is_null($state) && is_related_to_media_through_pivot($state->first())) {
$mediaIds = $state->map(fn ($model) => $model?->media_id)->toArray();

return Media::whereIn('id', $mediaIds)->get();
}

return $state;
}

if (is_a($state, Media::class)) {
Expand Down
19 changes: 18 additions & 1 deletion src/helpers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,18 @@ function is_media_resizable(string $type): bool
if (! function_exists('get_media_items')) {
function get_media_items(array | Media | int $ids): Collection | array
{
if ($ids instanceof Media) {
$mediaModel = config('curator.model');

if ($ids instanceof $mediaModel) {
return [$ids];
}

if (is_array($ids) && is_related_to_media_through_pivot(current($ids))) {
$mediaIds = collect($ids)->map(fn ($model) => $model?->media_id)->toArray();

return config('curator.model')::whereIn('id', $mediaIds)->get();
}

$ids = array_values($ids);

if (isset($ids[0]['id'])) {
Expand All @@ -39,6 +47,15 @@ function get_media_items(array | Media | int $ids): Collection | array
}
}

if (! function_exists('is_related_to_media_through_pivot')) {
function is_related_to_media_through_pivot(mixed $type): bool
{
$intermediateModelType = config('curator.intermediate_model');

return (! is_null(config('curator.intermediate_model'))) && $type instanceof $intermediateModelType;
}
}

if (! function_exists('is_panel_auth_route')) {
function is_panel_auth_route(): bool
{
Expand Down