wip

Author: pxpm

src/app/Library/Support/DataformCache.php

@@ -24,7 +24,7 @@ public function __construct()
      * @param  CrudPanel  $crud  The CRUD panel instance to update with form_id
      * @return bool Whether the operation was successful
      */
-    public function cacheForComponent(string $formId, string $controllerClass, array $fieldsConfig, ?string $name = null, ?CrudPanel $crud = null): bool
+    public function cacheForComponent(string $formId, string $controllerClass, array $fieldsConfig, ?CrudPanel $crud = null): bool
     {
         if (empty($fieldsConfig)) {
             return false;
@@ -45,8 +45,7 @@ public function cacheForComponent(string $formId, string $controllerClass, array
             $formId,
             $controllerClass,
             $parentController,
-            $parentEntry,
-            $name
+            $parentEntry
         );
 
         Cache::put($this->cachePrefix.$formId.'_fields', $fieldsConfig, now()->addMinutes($this->cacheDuration));
@@ -63,7 +62,6 @@ public static function applyAndStoreSetupClosure(
         string $formId,
         string $controllerClass,
         \Closure $setupClosure,
-        ?string $name = null,
         ?CrudPanel $crud = null,
         $parentEntry = null
     ): bool {
@@ -77,7 +75,7 @@ public static function applyAndStoreSetupClosure(
             }
 
             // Cache the field configuration (not the closure, since it won't persist across requests)
-            $cached = $instance->cacheForComponent($formId, $controllerClass, $fieldsAfterSetup, $name, $crud);
+            $cached = $instance->cacheForComponent($formId, $controllerClass, $fieldsAfterSetup, $crud);
 
             return $cached;
         }

src/app/View/Components/Dataform.php

@@ -10,6 +10,7 @@
 class Dataform extends Component implements IsolatesOperationSetup
 {
     public $crud;
+    
 
     /**
      * Standalone forms do NOT isolate their operation setup.
@@ -32,10 +33,10 @@ public function shouldIsolateOperationSetup(): bool
     public function __construct(
         public string $controller,
         private string $id = 'backpack-form-',
-        public string $name = '',
         public string $formOperation = 'create',
+        public ?string $formUrl = null,
         public ?string $formAction = null,
-        public string $formMethod = 'post',
+        public ?string $formMethod = 'post',
         public bool $hasUploadFields = false,
         public $entry = null,
         public ?Closure $setup = null,
@@ -57,8 +58,10 @@ public function __construct(
             $this->formMethod = 'put';
             $this->crud->entry = $this->entry;
             $this->crud->setOperationSetting('fields', $this->crud->getUpdateFields());
+            $this->formUrl = url($this->crud->route.'/'.$this->entry->getKey().'/edit');
         } else {
             $this->formAction = $formAction ?? url($this->crud->route);
+            $this->formUrl = url($this->crud->route.'/create');
         }
 
         $this->hasUploadFields = $this->crud->hasUploadFields($this->formOperation, $this->entry?->getKey());
@@ -104,7 +107,6 @@ public function render()
             'crud' => $this->crud,
             'saveAction' => $this->crud->getSaveAction(),
             'id' => $this->id,
-            'name' => $this->name,
             'formOperation' => $this->formOperation,
             'formAction' => $this->formAction,
             'formMethod' => $this->formMethod,

src/app/View/Components/DataformModal.php

@@ -20,13 +20,11 @@ public function shouldIsolateOperationSetup(): bool
 
     public function __construct(
         public string $controller,
-        public ?string $route = null,
         public string $id = 'backpack-form',
         public string $formOperation = 'create',
-        public string $name = '',
-        public string $formUrl = 'create',
+        public ?string $formUrl = null,
         public ?string $formAction = null,
-        public string $formMethod = 'post',
+        public ?string $formMethod = null,
         public bool $hasUploadFields = false,
         public $entry = null,
         public ?Closure $setup = null,
@@ -35,16 +33,9 @@ public function __construct(
         public string $classes = 'modal-dialog modal-lg',
         public bool $refreshDatatable = false,
     ) {
-        // If route is not provided (e.g., when rendering via AJAX), get it from CRUD panel
-        if ($this->route === null) {
-            \Backpack\CRUD\CrudManager::setActiveController($controller);
-            $tempCrud = \Backpack\CRUD\CrudManager::setupCrudPanel($controller, $this->formOperation);
-            $this->route = $tempCrud->route;
-            \Backpack\CRUD\CrudManager::unsetActiveController();
-        }
-
-        // keep backwards compatible behavior for resolving route when not provided
-        $this->formAction = $this->formAction ?? url($this->route);
+        \Backpack\CRUD\CrudManager::setActiveController($controller);
+        $this->crud = \Backpack\CRUD\CrudManager::setupCrudPanel($controller, $this->formOperation);
+        \Backpack\CRUD\CrudManager::unsetActiveController();
     }
 
     /**
@@ -61,7 +52,6 @@ protected function cacheSetupClosure(): void
             $this->hashedFormId,  // Use the hashed ID that matches what Dataform component generates
             $this->controller,
             $this->setup,
-            $this->name,
             $tempCrud,
             $this->entry
         );
@@ -77,9 +67,14 @@ protected function cacheSetupClosure(): void
     public function render()
     {
         $this->hashedFormId = $this->id.md5($this->formAction.$this->formOperation.'post'.$this->controller);
+        
+        if (empty($this->formUrl)) {
+            $this->formUrl = isset($this->entry) ? url($this->crud->route.'/'.$this->entry->getKey().'/edit') : url($this->crud->route.'/create');
+        }
 
-        if ($this->entry) {
-            $this->formUrl = $this->formUrl ?? url($this->route.'/'.$this->entry->getKey().'/edit');
+        if (empty($this->formAction)) {
+            $this->formAction = isset($this->entry) ? url($this->crud->route.'/'.$this->entry->getKey()) : url($this->crud->route);
+            $this->formMethod = $this->formMethod ?? (isset($this->entry) ? 'put' : 'post');
         }
 
         // Cache the setup closure if provided (for retrieval during AJAX request)
@@ -100,7 +95,6 @@ public function render()
             'classes' => $this->classes,
             'hashedFormId' => $this->hashedFormId,
             'controller' => $this->controller,
-            'route' => $this->route, // Pass the route for building URLs in the template
         ]);
     }
 }

src/resources/views/crud/buttons/create_in_modal.blade.php

@@ -1,6 +1,6 @@
 @if ($crud->hasAccess('create'))
     @php
-        $controllerClass = get_class(app('request')->route()->getController());
+        $controllerClass = $crud->controller ??get_class(app('request')->route()->getController());
     @endphp
 
     {{-- Create button that opens modal form --}}

src/resources/views/crud/buttons/update_in_modal.blade.php

@@ -1,6 +1,6 @@
 @if ($crud->hasAccess('update', $entry))
     @php
-        $controllerClass = get_class(app('request')->route()->getController());
+        $controllerClass = $crud->controller ?? get_class(app('request')->route()->getController());
     @endphp
 
     {{-- Update button that opens modal form --}}

src/resources/views/crud/components/dataform/form.blade.php

@@ -4,7 +4,6 @@
     <form method="post"
         action="{{ $formAction }}"
         id="{{ $id }}"
-        @if(!empty($name)) name="{{ $name }}" @endif
         @if($hasUploadFields) enctype="multipart/form-data" @endif
     >
         {!! csrf_field() !!}