Skip to content

fix disabled cast when in Nova context #409

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

fix disabled cast when in Nova context #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
41589d7
fix disabled cast when in Nova context
Dartui Oct 20, 2022
9ee91c8
simplify fix for missing cast in Nova context
Dartui Oct 20, 2022
c5cc6f1
Merge remote-tracking branch 'upstream/master' into nova-cast-issue
Dartui Jul 12, 2023
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
17 changes: 0 additions & 17 deletions src/Concerns/HasFlexible.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
namespace Whitecube\NovaFlexibleContent\Concerns;

use Illuminate\Support\Collection as BaseCollection;
use Laravel\Nova\NovaServiceProvider;
use Laravel\Nova\Support\Fluent;
use Whitecube\NovaFlexibleContent\Layouts\Collection;
use Whitecube\NovaFlexibleContent\Layouts\Layout;
Expand Down Expand Up @@ -33,22 +32,6 @@ public function flexible($attribute, $layoutMapping = [])
* @return \Whitecube\NovaFlexibleContent\Layouts\Collection
*/
public function cast($value, $layoutMapping = [])
{
if (app()->getProvider(NovaServiceProvider::class) && ! app()->runningInConsole()) {
return $value;
}

return $this->toFlexible($value ?: null, $layoutMapping);
}

/**
* Parse a Flexible Content from value
*
* @param array|string|\Illuminate\Support\Collection|null $value
* @param array $layoutMapping
* @return \Whitecube\NovaFlexibleContent\Layouts\Collection
*/
public function toFlexible($value, $layoutMapping = [])
{
$flexible = $this->getFlexibleArrayFromValue($value);

Expand Down
13 changes: 10 additions & 3 deletions src/Value/Resolver.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
namespace Whitecube\NovaFlexibleContent\Value;

use Illuminate\Support\Collection;
use Whitecube\NovaFlexibleContent\Layouts\Collection as LayoutsCollection;
use Whitecube\NovaFlexibleContent\Layouts\Layout;

class Resolver implements ResolverInterface
{
Expand Down Expand Up @@ -38,13 +40,16 @@ public function get($resource, $attribute, $layouts)
$value = $this->extractValueFromResource($resource, $attribute);

return collect($value)->map(function ($item) use ($layouts) {
$layout = $layouts->find($item->layout);
$layout = $layouts->find($item instanceof Layout ? $item->name() : $item->layout);

if (! $layout) {
return null;
}

return $layout->duplicateAndHydrate($item->key, (array) $item->attributes);
$key = $item instanceof Layout ? $item->key() : $item->key;
$attributes = $item instanceof Layout ? $item->getAttributes() : (array) $item->attributes;

return $layout->duplicateAndHydrate($key, $attributes);
})->filter()->values();
}

Expand All @@ -59,7 +64,9 @@ protected function extractValueFromResource($resource, $attribute)
{
$value = data_get($resource, str_replace('->', '.', $attribute)) ?? [];

if ($value instanceof Collection) {
if ($value instanceof LayoutsCollection) {
$value = $value->all();
} elseif ($value instanceof Collection) {
$value = $value->toArray();
} elseif (is_string($value)) {
$value = json_decode($value) ?? [];
Expand Down