Skip to content

Fixing belong to relation #47

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.

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

Merged
merged 1 commit into from
Aug 14, 2023
Merged
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
11 changes: 8 additions & 3 deletions src/Http/Controllers/ImportController.php
Original file line number Diff line number Diff line change
@@ -13,6 +13,7 @@
use Laravel\Nova\Actions\ActionResource;
use Laravel\Nova\Http\Requests\NovaRequest;
use Maatwebsite\Excel\Concerns\ToModel as ModelImporter;
use SimonHamp\LaravelNovaCsvImport\Http\Requests\ImportNovaRequest;

class ImportController
{
@@ -27,7 +28,7 @@ public function __construct(ModelImporter $importer, Filesystem $filesystem)
$this->filesystem = $filesystem;
}

public function configure(NovaRequest $request, string $file): Response
public function configure(ImportNovaRequest $request, string $file): Response
{
$file_name = pathinfo($file, PATHINFO_FILENAME);

@@ -127,7 +128,7 @@ public function preview(NovaRequest $request, string $file): Response
);
}

public function import(NovaRequest $request)
public function import(ImportNovaRequest $request)
{
$file = $request->input('file');

@@ -140,6 +141,8 @@ public function import(NovaRequest $request)
$resource_name = $config['resource'];

$resource = Nova::resourceInstanceForKey($resource_name);

$request->setImportResource(get_class($resource));
$rules = $this->extractValidationRules($resource, $request)->toArray();
$model_class = $resource->resource::class;

@@ -195,7 +198,7 @@ public function review(NovaRequest $request, string $file): Response
);
}

protected function getAvailableFieldsForImport(string $resource, NovaRequest $request): array
protected function getAvailableFieldsForImport(string $resource, ImportNovaRequest $request): array
{
$novaResource = new $resource(new $resource::$model);
$fieldsCollection = collect($novaResource->creationFields($request));
@@ -207,6 +210,8 @@ protected function getAvailableFieldsForImport(string $resource, NovaRequest $re
}

$fields = $fieldsCollection->map(function (Field $field) use ($novaResource, $request) {
$request->setImportResource($novaResource);

return [
'name' => $field->name,
'attribute' => $field->attribute,
39 changes: 39 additions & 0 deletions src/Http/Requests/ImportNovaRequest.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<?php

namespace SimonHamp\LaravelNovaCsvImport\Http\Requests;

use Laravel\Nova\Http\Requests\NovaRequest;

class ImportNovaRequest extends NovaRequest
{
/**
* @var
*/
protected $importResource;

/**
* @param mixed $resource
*/
public function setImportResource($resource): self
{
$this->importResource = $resource;

return $this;
}

/**
* Get the class name of the resource being requested.
*
* @return class-string<\Laravel\Nova\Resource>
*
* @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
*/
public function resource()
{
return tap(once(function () {
return $this->importResource;
}), function ($resource) {
abort_if(is_null($resource), 404);
});
}
}