Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 src/Fieldtypes/Assets/Assets.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
use Statamic\Fields\Fieldtype;
use Statamic\Fieldtypes\UpdatesReferences;
use Statamic\GraphQL\Types\AssetInterface;
use Statamic\Http\Resources\CP\Assets\Asset as AssetResource;
use Statamic\Http\Resources\CP\Assets\AssetsFieldtypeAsset as AssetResource;
use Statamic\Query\Scopes\Filter;
use Statamic\Support\Arr;
use Statamic\Support\Str;
Expand Down
45 changes: 45 additions & 0 deletions src/Http/Resources/CP/Assets/AssetsFieldtypeAsset.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
<?php

namespace Statamic\Http\Resources\CP\Assets;

use Illuminate\Http\Resources\Json\JsonResource;
use Statamic\Facades\User;
use Statamic\Support\Str;

class AssetsFieldtypeAsset extends JsonResource
{
use HasThumbnails;

public function toArray($request)
{
$data = [
'id' => $this->id(),
'basename' => $this->basename(),
'extension' => $this->extension(),
'size' => Str::fileSizeForHumans($this->size()),
'isImage' => $this->isImage(),
'url' => $this->url(),
'downloadUrl' => $this->cpDownloadUrl(),
'isSvg' => $this->isSvg(),
'isMedia' => $this->isMedia(),
'isEditable' => User::current()->can('edit', $this->resource),
'isViewable' => User::current()->can('view', $this->resource),
...$this->thumbnails(),
...$this->publishFormData(),
];

return ['data' => $data];
}

protected function publishFormData()
{
$fields = $this->blueprint()->fields()
->addValues($this->data()->all())
->preProcess();

return [
'values' => $this->data()->merge($fields->values()),
'meta' => $fields->meta(),
];
}
}
75 changes: 75 additions & 0 deletions tests/Http/Resources/CP/Assets/AssetsFieldtypeAssetTest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
<?php

namespace Tests\Http\Resources\CP\Assets;

use Illuminate\Support\Facades\Storage;
use PHPUnit\Framework\Attributes\Test;
use Statamic\Facades\AssetContainer;
use Statamic\Facades\User;
use Statamic\Http\Resources\CP\Assets\AssetsFieldtypeAsset;
use Tests\FakesRoles;
use Tests\PreventSavingStacheItemsToDisk;
use Tests\TestCase;

class AssetsFieldtypeAssetTest extends TestCase
{
use FakesRoles;
use PreventSavingStacheItemsToDisk;

private $container;

protected function setUp(): void
{
parent::setUp();

Storage::fake('test', ['url' => '/assets']);
Storage::disk('test')->put('img/photo.jpg', '');

$this->container = AssetContainer::make('test')->disk('test')->save();
}

#[Test]
public function it_returns_expected_data()
{
$this->actingAs(tap(User::make()->makeSuper())->save());

$asset = AssetContainer::find('test')->asset('img/photo.jpg');

$resource = (new AssetsFieldtypeAsset($asset))->resolve()['data'];

$this->assertEquals('test::img/photo.jpg', $resource['id']);
$this->assertEquals('photo.jpg', $resource['basename']);
$this->assertEquals('jpg', $resource['extension']);
$this->assertEquals('/assets/img/photo.jpg', $resource['url']);
$this->assertArrayHasKey('downloadUrl', $resource);
$this->assertArrayHasKey('size', $resource);
$this->assertTrue($resource['isImage']);
$this->assertFalse($resource['isSvg']);
$this->assertTrue($resource['isMedia']);
$this->assertTrue($resource['isEditable']);
$this->assertTrue($resource['isViewable']);
$this->assertArrayHasKey('thumbnail', $resource);
$this->assertArrayHasKey('values', $resource);
$this->assertArrayHasKey('meta', $resource);

$this->assertArrayNotHasKey('actions', $resource);
$this->assertArrayNotHasKey('actionUrl', $resource);
$this->assertArrayNotHasKey('blueprint', $resource);
}

#[Test]
public function it_reflects_permissions()
{
$this->setTestRoles(['test' => ['view test assets']]);

$user = tap(User::make()->assignRole('test'))->save();
$this->actingAs($user);

$asset = AssetContainer::find('test')->asset('img/photo.jpg');

$resource = (new AssetsFieldtypeAsset($asset))->resolve()['data'];

$this->assertFalse($resource['isEditable']);
$this->assertTrue($resource['isViewable']);
}
}
Loading