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
8 changes: 6 additions & 2 deletions src/Filament/Resources/ProductResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use Eclipse\Catalogue\Enums\PropertyInputType;
use Eclipse\Catalogue\Filament\Filters\CustomPropertyConstraint;
use Eclipse\Catalogue\Filament\Forms\Components\ImageManager;
use Eclipse\Catalogue\Filament\Resources\ProductResource\Pages\CreateProduct;
use Eclipse\Catalogue\Filament\Resources\ProductResource\Pages\EditProduct;
use Eclipse\Catalogue\Filament\Resources\ProductResource\Pages\ListProducts;
Expand All @@ -21,6 +20,7 @@
use Eclipse\Catalogue\Support\LabelType;
use Eclipse\Catalogue\Traits\HandlesTenantData;
use Eclipse\Catalogue\Traits\HasTenantFields;
use Eclipse\Common\Filament\Forms\Components\MediaGallery;
use Eclipse\World\Models\Country;
use Eclipse\World\Models\TariffCode;
use Filament\Actions\ActionGroup;
Expand Down Expand Up @@ -560,10 +560,14 @@ function ($query) {

Tab::make('Images')
->schema([
ImageManager::make('images')
MediaGallery::make('images')
->label('')
->collection('images')
->acceptedFileTypes(['image/jpeg', 'image/png', 'image/gif', 'image/webp'])
->allowUploads()
->preview()
->orderable()
->mediaColumns(4)
->columnSpanFull(),
]),
])
Expand Down
17 changes: 10 additions & 7 deletions src/Filament/Resources/ProductResource/Pages/CreateProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,15 @@
use Eclipse\Catalogue\Traits\HandlesTenantData;
use Eclipse\Catalogue\Traits\HasTenantFields;
use Filament\Resources\Pages\CreateRecord;
use Filament\Schemas\Schema;
use Illuminate\Database\Eloquent\Model;
use LaraZeus\SpatieTranslatable\Actions\LocaleSwitcher;
use LaraZeus\SpatieTranslatable\Resources\Pages\CreateRecord\Concerns\Translatable;

class CreateProduct extends CreateRecord
{
use HandlesImageUploads;
use HandlesImageUploads {
afterCreate as handleImageUploadsAfterCreate;
}
use HandlesTenantData, HasTenantFields;
use Translatable;

Expand All @@ -33,6 +34,11 @@ protected function getHeaderActions(): array

protected function mutateFormDataBeforeCreate(array $data): array
{
if (isset($data['images'])) {
$this->temporaryImages = $data['images'];
unset($data['images']);
}

foreach (array_keys($data) as $key) {
if (str_starts_with($key, 'property_values_') || str_starts_with($key, 'custom_property_')) {
unset($data[$key]);
Expand All @@ -52,11 +58,6 @@ protected function getFormMutuallyExclusiveFlagSets(): array
return [];
}

public function form(Schema $schema): Schema
{
return $schema;
}

protected function handleRecordCreation(array $data): Model
{
$tenantData = $this->extractTenantDataFromFormData($data);
Expand Down Expand Up @@ -94,6 +95,8 @@ protected function afterCreate(): void
return;
}

$this->handleImageUploadsAfterCreate();

$state = $this->form->getState();
$rawState = $this->form->getRawState();
$tenantData = $state['tenant_data'] ?? [];
Expand Down
6 changes: 0 additions & 6 deletions src/Filament/Resources/ProductResource/Pages/EditProduct.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
use Filament\Actions\ViewAction;
use Filament\Facades\Filament;
use Filament\Resources\Pages\EditRecord;
use Filament\Schemas\Schema;
use Illuminate\Database\Eloquent\Model;
use LaraZeus\SpatieTranslatable\Actions\LocaleSwitcher;
use LaraZeus\SpatieTranslatable\Resources\Pages\EditRecord\Concerns\Translatable;
Expand Down Expand Up @@ -217,11 +216,6 @@ protected function getFormMutuallyExclusiveFlagSets(): array
return [];
}

public function form(Schema $schema): Schema
{
return $schema;
}

protected function getFormActions(): array
{
return [
Expand Down