wip

Author: pxpm

src/app/Http/Controllers/Operations/CreateOperation.php

@@ -50,7 +50,7 @@ protected function setupCreateDefaults()
 
             if ($useModalForm) {
                 $this->crud->removeButton('create');
-                $this->crud->addButton('top', 'create', 'view', 'crud::buttons.create_modal_form', 'beginning');
+                $this->crud->addButton('top', 'create', 'view', 'crud::buttons.create_in_modal', 'beginning');
             }
         });
     }
@@ -65,8 +65,8 @@ public function create()
         $this->crud->hasAccessOrFail('create');
 
         // Apply cached form setup if this is an AJAX request from a modal
-        if (request()->ajax() && request()->has('_form_id')) {
-            \Backpack\CRUD\app\Library\Support\DataformCache::applyFromRequest($this->crud);
+        if (request()->ajax() && request()->has('_modal_form_id')) {
+            \Backpack\CRUD\app\Library\Support\DataformCache::applySetupClosure($this->crud);
         }
 
         // prepare the fields you need to show
@@ -75,7 +75,7 @@ public function create()
         $this->data['title'] = $this->crud->getTitle() ?? trans('backpack::crud.add').' '.$this->crud->entity_name;
 
         // return the ajax response for modal forms, or the normal view for normal requests
-        return  request()->ajax() ?
+        return  request()->ajax() && request()->has('_modal_form_id') ?
             view('crud::components.dataform.ajax_response', $this->data) :
             view($this->crud->getCreateView(), $this->data);
     }

src/app/Http/Controllers/Operations/UpdateOperation.php

@@ -60,7 +60,7 @@ protected function setupUpdateDefaults()
 
             if ($useModalForm) {
                 $this->crud->removeButton('update');
-                $this->crud->addButton('line', 'update', 'view', 'crud::buttons.update_modal_form', 'end');
+                $this->crud->addButton('line', 'update', 'view', 'crud::buttons.update_in_modal', 'end');
             }
         });
     }
@@ -79,8 +79,8 @@ public function edit($id)
         $id = $this->crud->getCurrentEntryId() ?? $id;
 
         // Apply cached form setup if this is an AJAX request from a modal
-        if (request()->ajax() && request()->has('_form_id')) {
-            \Backpack\CRUD\app\Library\Support\DataformCache::applyFromRequest($this->crud);
+        if (request()->ajax() && request()->has('_modal_form_id')) {
+            \Backpack\CRUD\app\Library\Support\DataformCache::applySetupClosure($this->crud);
         }
 
         // register any Model Events defined on fields
@@ -97,7 +97,7 @@ public function edit($id)
         $this->data['id'] = $id;
 
         // load the view from /resources/views/vendor/backpack/crud/ if it exists, otherwise load the one in the package
-        return  request()->ajax() ?
+        return  request()->ajax() && request()->has('_modal_form_id') ?
              view('crud::components.dataform.ajax_response', $this->data) :
              view($this->crud->getEditView(), $this->data);
     }

src/app/Library/Support/DataformCache.php

@@ -70,7 +70,7 @@ public static function applyAndStoreSetupClosure(
     ): bool {
         $instance = new self();
         // Apply the setup closure to the CrudPanel instance
-        if ($instance->applySetupClosure($crud, $controllerClass, $setupClosure, $parentEntry)) {
+        if ($instance->applyClosure($crud, $controllerClass, $setupClosure, $parentEntry)) {
             // Capture the resulting field configuration after setup
             $fieldsAfterSetup = [];
             foreach ($crud->fields() as $fieldName => $field) {
@@ -92,11 +92,11 @@ public static function applyAndStoreSetupClosure(
      * @param  CrudPanel  $crud  The CRUD panel instance
      * @return bool Whether the operation was successful
      */
-    public static function applyFromRequest(CrudPanel $crud): bool
+    public static function applySetupClosure(CrudPanel $crud): bool
     {
         $instance = new self();
-        // Check if the request has a _form_id parameter
-        $formId = request('_form_id');
+        // Check if the request has a _modal_form_id parameter
+        $formId = request('_modal_form_id');
 
         if (! $formId) {
             return false;
@@ -114,7 +114,7 @@ public static function applyFromRequest(CrudPanel $crud): bool
      * @param  mixed  $entry  The entry to pass to the setup closure
      * @return bool Whether the operation was successful
      */
-    public function applySetupClosure(CrudPanel $crud, string $controllerClass, \Closure $setupClosure, $entry = null): bool
+    private function applyClosure(CrudPanel $crud, string $controllerClass, \Closure $setupClosure, $entry = null): bool
     {
         $originalSetup = $setupClosure;
         $modifiedSetup = function ($crud, $entry) use ($originalSetup, $controllerClass) {

src/app/View/Components/Dataform.php

@@ -97,8 +97,8 @@ private function getParentCrudEntry()
      */
     public function render()
     {
-        // Store the current form ID in the service container for form-aware old() helper
-        app()->instance('backpack.current_form_id', $this->id);
+    // Store the current form ID in the service container for form-aware old() helper
+    app()->instance('backpack.current_form_modal_id', $this->id);
 
         return view('crud::components.dataform.form', [
             'crud' => $this->crud,

src/app/View/Components/DataformModal.php

@@ -5,7 +5,7 @@
 use Backpack\CRUD\app\View\Components\Contracts\IsolatesOperationSetup;
 use Closure;
 
-class DataformModal extends DataForm implements IsolatesOperationSetup
+class DataformModal extends Dataform implements IsolatesOperationSetup
 {
     /**
      * Modal forms ALWAYS isolate their operation setup.
@@ -16,28 +16,11 @@ public function shouldIsolateOperationSetup(): bool
         return true;
     }
 
-    /**
-     * Create a new component instance.
-     *
-     * @param  string  $controller  The CRUD controller class name
-     * @param  string  $operation  The operation to use (create, update, etc.)
-     * @param  string|null  $action  Custom form action URL
-     * @param  string  $method  Form method (post, put, etc.)
-     * @param  bool  $hasUploadFields  Whether the form has upload fields
-     * @param  mixed|null  $entry  The model instance for update operations
-     * @param  Closure|null  $setup  A closure to customize the CRUD panel
-     * @param  string  $formRouteOperation  The operation to use for the form route (defaults to 'create')
-     * @param  string  $id  The ID for the form element (defaults to 'backpack-form')
-     * @param  bool  $focusOnFirstField  Whether to focus on the first field when form loads
-     * @param  string  $title  The title of the modal
-     * @param  string  $classes  CSS classes for the modal dialog
-     * @param  bool  $refreshDatatable  Whether to refresh the datatable after form submission
-     */
     public string $hashedFormId;
 
     public function __construct(
         public string $controller,
-        public ?string $route = null, // Accept route as an optional parameter
+        public ?string $route = null,
         public string $id = 'backpack-form',
         public string $operation = 'create',
         public string $name = '',
@@ -60,12 +43,10 @@ public function __construct(
             \Backpack\CRUD\CrudManager::unsetActiveController();
         }
 
-        // Use the provided/resolved route instead of calling setupCrudPanel on every render
-        // This avoids operation switching during page load when route is provided
-        $action = $this->action ?? url($this->route);
+    $this->action = $this->action ?? url($this->route);
 
-        // Generate the SAME hashed form ID that the DataForm component uses
-        $this->hashedFormId = $this->id.md5($action.$this->operation.'post'.$this->controller);
+    // Generate the SAME hashed form ID that the Dataform component uses
+    $this->hashedFormId = $this->id.md5($action.$this->operation.'post'.$this->controller);
 
         // Cache the setup closure if provided (for retrieval during AJAX request)
         if ($this->setup instanceof \Closure) {
@@ -76,7 +57,8 @@ public function __construct(
         // the CRUD panel on page load - the form will be loaded via AJAX
 
         if ($this->entry && $this->operation === 'update') {
-            $this->formRouteOperation = url($action.'/'.$this->entry->getKey().'/edit');
+            // Use the resolved action (base route) to build the edit URL for the entry
+            $this->formRouteOperation = url($this->action.'/'.$this->entry->getKey().'/edit');
         }
     }
 
@@ -91,7 +73,7 @@ protected function cacheSetupClosure(): void
 
         // Apply and cache the setup closure using the HASHED ID
         \Backpack\CRUD\app\Library\Support\DataformCache::applyAndStoreSetupClosure(
-            $this->hashedFormId,  // Use the hashed ID that matches what DataForm component generates
+            $this->hashedFormId,  // Use the hashed ID that matches what Dataform component generates
             $this->controller,
             $this->setup,
             null,

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

@@ -0,0 +1,27 @@
+@if ($crud->hasAccess('create'))
+    @php
+        $controllerClass = get_class(app('request')->route()->getController());
+    @endphp
+    
+    {{-- Create button that opens modal form --}}
+    <button 
+        type="button" 
+        class="btn btn-primary" 
+        data-bs-toggle="modal"
+        data-bs-target="#createModal{{ md5($controllerClass.'create') }}"
+        bp-button="create" 
+        data-style="zoom-in"
+    >
+        <i class="la la-plus"></i> <span>{{ trans('backpack::crud.add') }} {{ $crud->entity_name }}</span>
+    </button>
+
+    {{-- Include the modal form component --}}
+    <x-backpack::dataform-modal
+        :controller="$controllerClass"
+        operation="create"
+        id="createModal{{ md5($controllerClass.'create') }}"
+        :title="trans('backpack::crud.add') . ' ' . $crud->entity_name"
+        :route="$crud->route"
+        refresh-datatable="true"
+    />
+@endif

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

@@ -0,0 +1,49 @@
+@if ($crud->hasAccess('update', $entry))
+    @php
+        $controllerClass = get_class(app('request')->route()->getController());
+    @endphp
+    
+    {{-- Update button that opens modal form --}}
+    @if (!$crud->model->translationEnabled())
+        <button 
+            type="button" 
+            class="btn btn-sm btn-link" 
+            data-bs-toggle="modal"
+            data-bs-target="#updateModal{{ md5($controllerClass.'update'.$entry->getKey()) }}"
+            bp-button="update"
+        >
+            <i class="la la-edit"></i> <span>{{ trans('backpack::crud.edit') }}</span>
+        </button>
+    @else
+        {{-- Edit button group for translated models --}}
+        <div class="btn-group">
+            <button 
+                type="button" 
+                class="btn btn-sm btn-link pr-0" 
+                data-bs-toggle="modal"
+                data-bs-target="#updateModal{{ md5($controllerClass.'update'.$entry->getKey()) }}"
+            >
+                <span><i class="la la-edit"></i> {{ trans('backpack::crud.edit') }}</span>
+            </button>
+            <a class="btn btn-sm btn-link dropdown-toggle text-primary pl-1" data-toggle="dropdown" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="caret"></span>
+            </a>
+            <ul class="dropdown-menu dropdown-menu-right">
+                <li class="dropdown-header">{{ trans('backpack::crud.edit_translations') }}:</li>
+                @foreach ($crud->model->getAvailableLocales() as $key => $locale)
+                    <li><a class="dropdown-item" href="{{ url($crud->route.'/'.$entry->getKey().'/edit') }}?_locale={{ $key }}">{{ $locale }}</a></li>
+                @endforeach
+            </ul>
+        </div>
+    @endif
+
+    {{-- Include the modal form component --}}
+    <x-backpack::dataform-modal
+        :controller="$controllerClass"
+        operation="update"
+        :entry="$entry"
+        id="updateModal{{ md5($controllerClass.'update'.$entry->getKey()) }}"
+        :title="trans('backpack::crud.edit') . ' ' . $crud->entity_name"
+        refresh-datatable="true"
+    />
+@endif

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

@@ -40,75 +40,5 @@
 @stack('after_styles')
 
 <script>
-    // Define utility functions needed by field initialization scripts
-    // These are normally included in form_content.blade.php but missing in AJAX context
-
-    /**
-     * Initialize all fields with JavaScript based on their data-init-function attribute
-     * @param {jQuery|HTMLElement} container
-     */
-    function initializeFieldsWithJavascript(container) {
-        var selector;
-        if (container instanceof jQuery) {
-            selector = container;
-        } else {
-            selector = $(container);
-        }
-        
-        selector.find("[data-init-function]").not("[data-initialized=true]").each(function () {
-            var element = $(this);
-            var functionName = element.data('init-function');
-
-            if (typeof window[functionName] === "function") {
-                window[functionName](element);
-                // mark the element as initialized, so that its function is never called again
-                element.attr('data-initialized', 'true');
-            }
-        });
-    }
-
-    /**
-     * Auto-discover first focusable input
-     * @param {jQuery} form
-     * @return {jQuery}
-     */
-    function getFirstFocusableField(form) {
-        return form.find('input, select, textarea, button')
-            .not('.close')
-            .not('[disabled]')
-            .filter(':visible:first');
-    }
-
-    /**
-     *
-     * @param {jQuery} firstField
-     */
-    function triggerFocusOnFirstInputField(firstField) {
-        if (firstField.hasClass('select2-hidden-accessible')) {
-            return handleFocusOnSelect2Field(firstField);
-        }
-
-        firstField.trigger('focus');
-    }
-
-    /**
-     * 1- Make sure no other select2 input is open in other field to focus on the right one
-     * 2- Check until select2 is initialized
-     * 3- Open select2
-     *
-     * @param {jQuery} firstField
-     */
-    function handleFocusOnSelect2Field(firstField){
-        firstField.select2('focus');
-    }
-
-    /*
-    * Hacky fix for a bug in select2 with jQuery 3.6.0's new nested-focus "protection"
-    * see: https://github.com/select2/select2/issues/5993
-    * see: https://github.com/jquery/jquery/issues/4382
-    *
-    */
-    $(document).on('select2:open', () => {
-        setTimeout(() => document.querySelector('.select2-container--open .select2-search__field').focus(), 100);
-    });
+    @include('crud::components.dataform.common_js')
 </script>