feat: Redirect improvements

moonshine-software · Dec 22, 2024 · 9cfa43d · 9cfa43d
1 parent 1f71aac
commit 9cfa43d
Show file tree

Hide file tree

Showing 7 changed files with 49 additions and 37 deletions.
diff --git a/src/Laravel/src/Fields/Relationships/HasMany.php b/src/Laravel/src/Fields/Relationships/HasMany.php
@@ -105,15 +105,19 @@ public function redirectAfter(Closure $callback): static
         return $this;
     }
 
-    public function getRedirectAfter(Model|int|null|string $parentId): string
+    public function getRedirectAfter(Model|int|null|string $parentId): ?string
     {
         if (! \is_null($this->redirectAfter)) {
             return (string) value($this->redirectAfter, $parentId, $this);
         }
 
+        if($this->isAsync()) {
+            return null;
+        }
+
         return moonshineRequest()
             ->getResource()
-            ?->getFormPageUrl($parentId) ?? '';
+            ?->getFormPageUrl($parentId);
     }
 
     /**
@@ -450,10 +454,9 @@ protected function getItemButtons(): array
     {
         $resource = $this->getResource()->stopGettingItemFromUrl();
 
-        $redirectAfter = $this->isAsync()
-            ? '' : $this->getRedirectAfter(
-                $this->getRelatedModel()?->getKey()
-            );
+        $redirectAfter = $this->getRedirectAfter(
+            $this->getRelatedModel()?->getKey()
+        );
 
         $editButton = $this->editButton ?? HasManyButton::for($this, update: true);
 

diff --git a/src/Laravel/src/Fields/Relationships/HasOne.php b/src/Laravel/src/Fields/Relationships/HasOne.php
@@ -162,15 +162,19 @@ public function redirectAfter(Closure $callback): static
         return $this;
     }
 
-    public function getRedirectAfter(Model|int|null|string $parentId): string
+    public function getRedirectAfter(Model|int|null|string $parentId): ?string
     {
         if (! \is_null($this->redirectAfter)) {
             return (string) value($this->redirectAfter, $parentId, $this);
         }
 
+        if($this->isAsync()) {
+            return null;
+        }
+
         return moonshineRequest()
-                   ->getResource()
-                   ?->getFormPageUrl($parentId) ?? '';
+           ->getResource()
+           ?->getFormPageUrl($parentId);
     }
 
     /**
@@ -257,7 +261,7 @@ protected function getComponent(): FormBuilder
                 )
                     ->toArray()
             )
-            ->redirect($isAsync ? null : $redirectAfter)
+            ->redirect($redirectAfter)
             ->fillCast(
                 $item?->toArray() ?? array_filter([
                 $relation->getForeignKeyName() => $this->getRelatedModel()?->getKey(),

diff --git a/src/Laravel/src/Fields/Relationships/ModelRelationField.php b/src/Laravel/src/Fields/Relationships/ModelRelationField.php
@@ -15,6 +15,7 @@
 use Illuminate\Support\Stringable;
 use MoonShine\Contracts\Core\HasResourceContract;
 use MoonShine\Contracts\Core\TypeCasts\DataWrapperContract;
+use MoonShine\Contracts\UI\HasFieldsContract;
 use MoonShine\Core\Traits\HasResource;
 use MoonShine\Laravel\Resources\ModelResource;
 use MoonShine\UI\Exceptions\FieldException;
@@ -86,6 +87,11 @@ public function __construct(
         } else {
             $this->setResource($resource);
         }
+
+        // required to create field entities and load assets
+        if($this instanceof HasFieldsContract) {
+            $this->getResource()?->getFormFields();
+        }
     }
 
     /**

diff --git a/src/Laravel/src/Http/Controllers/CrudController.php b/src/Laravel/src/Http/Controllers/CrudController.php
@@ -7,13 +7,15 @@
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Contracts\Support\Jsonable;
 use Illuminate\Foundation\Http\Middleware\HandlePrecognitiveRequests;
+use MoonShine\Contracts\Core\CrudResourceContract;
 use MoonShine\Laravel\Contracts\Notifications\MoonShineNotificationContract;
 use MoonShine\Laravel\Http\Requests\MoonShineFormRequest;
 use MoonShine\Laravel\Http\Requests\Resources\DeleteFormRequest;
 use MoonShine\Laravel\Http\Requests\Resources\MassDeleteFormRequest;
 use MoonShine\Laravel\Http\Requests\Resources\StoreFormRequest;
 use MoonShine\Laravel\Http\Requests\Resources\UpdateFormRequest;
 use MoonShine\Laravel\MoonShineRequest;
+use MoonShine\Laravel\Resources\CrudResource;
 use MoonShine\Support\Enums\ToastType;
 use Symfony\Component\HttpFoundation\Response;
 use Throwable;
@@ -99,7 +101,7 @@ public function destroy(DeleteFormRequest $request): Response
         if ($request->ajax() || $request->wantsJson()) {
             return $this->json(
                 message: __('moonshine::ui.deleted'),
-                redirect: $redirectRoute
+                redirect: $request->input('_redirect')
             );
         }
 
@@ -108,10 +110,6 @@ public function destroy(DeleteFormRequest $request): Response
             ToastType::SUCCESS
         );
 
-        if(\is_null($redirectRoute)) {
-            return back();
-        }
-
         return redirect($redirectRoute);
     }
 
@@ -131,7 +129,7 @@ public function massDelete(MassDeleteFormRequest $request): Response
         if ($request->ajax() || $request->wantsJson()) {
             return $this->json(
                 message: __('moonshine::ui.deleted'),
-                redirect: $redirectRoute
+                redirect: $request->input('_redirect')
             );
         }
 
@@ -140,10 +138,6 @@ public function massDelete(MassDeleteFormRequest $request): Response
             ToastType::SUCCESS
         );
 
-        if(\is_null($redirectRoute)) {
-            return back();
-        }
-
         return redirect($redirectRoute);
     }
 
@@ -157,7 +151,15 @@ protected function updateOrCreate(
         $resource = $request->getResource();
         $item = $resource->getItemOrInstance();
 
-        $redirectRoute = static fn ($resource): ?string => $request->input('_redirect', $resource->getRedirectAfterSave());
+        $redirectRoute = static function (CrudResource $resource) use($request): ?string {
+            $redirect = $request->input('_redirect', $resource->getRedirectAfterSave());
+
+            if(\is_null($redirect) && !$resource->isCreateInModal() && $resource->isRecentlyCreated()) {
+                return $resource->getFormPageUrl($resource->getCastedData());
+            }
+
+            return $redirect;
+        };
 
         try {
             $item = $resource->save($item);

diff --git a/src/Laravel/src/Traits/Resource/ResourceCrudRouter.php b/src/Laravel/src/Traits/Resource/ResourceCrudRouter.php
@@ -126,18 +126,14 @@ public function getRedirectAfterSave(): ?string
             ? []
             : ['resourceItem' => $this->getCastedData()?->getKey()];
 
-        if (! \is_null($this->redirectAfterSave)) {
-            return $this
-                ->getPages()
-                ->findByType($this->redirectAfterSave)
-                ?->getRoute($params);
-        }
-
-        return $this->getFormPageUrl(params: $params);
+        return $this
+            ->getPages()
+            ->findByType($this->redirectAfterSave)
+            ?->getRoute($params);
     }
 
-    public function getRedirectAfterDelete(): ?string
+    public function getRedirectAfterDelete(): string
     {
-        return null;
+        return $this->getIndexPageUrl();
     }
 }
diff --git a/src/Laravel/src/Traits/Resource/ResourceWithButtons.php b/src/Laravel/src/Traits/Resource/ResourceWithButtons.php
@@ -178,7 +178,7 @@ public function getDeleteButton(
             DeleteButton::for(
                 $this,
                 componentName: $componentName,
-                redirectAfterDelete: $redirectAfterDelete,
+                redirectAfterDelete: $isAsync ? null : $redirectAfterDelete,
                 isAsync: $isAsync,
                 modalName: $modalName
             )
@@ -200,7 +200,7 @@ public function getMassDeleteButton(
             MassDeleteButton::for(
                 $this,
                 componentName: $componentName,
-                redirectAfterDelete: $redirectAfterDelete,
+                redirectAfterDelete: $isAsync ? null : $redirectAfterDelete,
                 isAsync: $isAsync,
                 modalName: $modalName
             )

diff --git a/tests/Feature/Controllers/CrudControllerTest.php b/tests/Feature/Controllers/CrudControllerTest.php
@@ -90,7 +90,7 @@
             $this->itemResource->getRoute('crud.update', $item->getKey()),
             ['name' => 'New test name']
         )
-            ->assertRedirect();
+            ->assertRedirect($this->itemResource->getFormPageUrl($item->getKey()));
 
         $item->refresh();
 
@@ -104,7 +104,7 @@
         asAdmin()->delete(
             $this->itemResource->getRoute('crud.destroy', $item->getKey())
         )
-            ->assertRedirect();
+            ->assertRedirect($this->itemResource->getIndexPageUrl());
     });
 
     it('when component crud delete', function () {
@@ -136,7 +136,7 @@
         asAdmin()->delete(
             $this->itemResource->getRoute('crud.destroy', $item->getKey())
         )
-            ->assertRedirect();
+            ->assertRedirect($this->itemResource->getIndexPageUrl());
     });
 
     it('crud mass delete', function () {
@@ -147,7 +147,8 @@
         asAdmin()->delete(
             $this->itemResource->getRoute('crud.massDelete', query: ['ids' => $ids])
         )
-            ->assertRedirect();
+            ->assertRedirect($this->itemResource->getIndexPageUrl())
+        ;
 
         $items = Item::query()->get()->toArray();