From 0a6ccbb2a2c25275fc35316e4194fdb268936764 Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Wed, 8 Jan 2025 14:51:38 +0100
Subject: [PATCH 1/6] Add a modal action whose content is loaded via an HTTP
 call.

---
 assets/controllers/bootstrap/modal.js         | 27 ++++++++
 assets/package.json                           |  7 +-
 src/Action/Type/ModalActionType.php           | 68 +++++++++++++++++++
 src/Resources/config/actions.php              |  7 ++
 src/Resources/views/themes/base.html.twig     | 12 ++++
 .../views/themes/bootstrap_5.html.twig        | 26 +++++++
 6 files changed, 146 insertions(+), 1 deletion(-)
 create mode 100644 assets/controllers/bootstrap/modal.js
 create mode 100755 src/Action/Type/ModalActionType.php

diff --git a/assets/controllers/bootstrap/modal.js b/assets/controllers/bootstrap/modal.js
new file mode 100644
index 00000000..16728a8c
--- /dev/null
+++ b/assets/controllers/bootstrap/modal.js
@@ -0,0 +1,27 @@
+import { Controller } from '@hotwired/stimulus';
+import { Modal } from 'bootstrap'; // Import Bootstrap
+
+export default class extends Controller {
+    static targets = ['modal'];
+
+    static values = {
+        url: String,
+    }
+
+    open(event) {
+        event.preventDefault();
+        const modalContent = this.modalTarget;
+
+        fetch(this.urlValue)
+            .then(response => {
+                if (!response.ok) {
+                    throw new Error('Error loading content.');
+                }
+                return response.text();
+            })
+            .then(html => {
+                modalContent.innerHTML = html;
+            })
+        ;
+    }
+}
diff --git a/assets/package.json b/assets/package.json
index 36305897..ff580e13 100755
--- a/assets/package.json
+++ b/assets/package.json
@@ -19,6 +19,11 @@
                 "main": "controllers/state.js",
                 "fetch": "eager",
                 "enabled": true
+            },
+            "bootstrap-modal": {
+                "main": "controllers/bootstrap/modal.js",
+                "fetch": "eager",
+                "enabled": true
             }
         },
         "importmap": {
@@ -34,4 +39,4 @@
         "@hotwired/stimulus": "^3.0.0",
         "sortablejs": "^1.15.0"
     }
-}
\ No newline at end of file
+}
diff --git a/src/Action/Type/ModalActionType.php b/src/Action/Type/ModalActionType.php
new file mode 100755
index 00000000..1fdd053c
--- /dev/null
+++ b/src/Action/Type/ModalActionType.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Kreyu\Bundle\DataTableBundle\Action\Type;
+
+use Kreyu\Bundle\DataTableBundle\Action\ActionInterface;
+use Kreyu\Bundle\DataTableBundle\Action\ActionView;
+use Kreyu\Bundle\DataTableBundle\Column\ColumnValueView;
+use Kreyu\Bundle\DataTableBundle\Exception\LogicException;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+use Symfony\Component\Routing\RouterInterface;
+
+final class ModalActionType extends AbstractActionType
+{
+    public function __construct(
+        private readonly RouterInterface $router,
+    ) {
+    }
+
+    public function buildView(ActionView $view, ActionInterface $action, array $options): void
+    {
+        if (null === $options['href'] && null === $options['route']) {
+            throw new LogicException('No "route" or "href" provided.');
+        }
+
+        if ($view->parent instanceof ColumnValueView) {
+            $value = $view->parent->value;
+
+            foreach (['href', 'route', 'route_params'] as $optionName) {
+                if (isset($options[$optionName]) && is_callable($options[$optionName])) {
+                    $options[$optionName] = $options[$optionName]($value);
+                }
+            }
+        } else {
+            foreach (['href', 'route', 'route_params'] as $optionName) {
+                if (isset($options[$optionName]) && is_callable($options[$optionName])) {
+                    throw new LogicException(sprintf('Callable used for option "%s", but it\'s only available for RowActions.', $optionName));
+                }
+            }
+        }
+
+        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params']);
+
+        $view->vars = array_replace($view->vars, [
+            'href' => $href,
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver
+            ->define('route')
+            ->allowedTypes('string', 'callable')
+        ;
+
+        $resolver
+            ->define('route_params')
+            ->allowedTypes('array', 'callable')
+            ->default([])
+        ;
+
+        $resolver
+            ->define('href')
+            ->allowedTypes('string', 'callable')
+        ;
+    }
+}
diff --git a/src/Resources/config/actions.php b/src/Resources/config/actions.php
index 5f76912b..83c31ee9 100755
--- a/src/Resources/config/actions.php
+++ b/src/Resources/config/actions.php
@@ -10,6 +10,7 @@
 use Kreyu\Bundle\DataTableBundle\Action\Type\ButtonActionType;
 use Kreyu\Bundle\DataTableBundle\Action\Type\FormActionType;
 use Kreyu\Bundle\DataTableBundle\Action\Type\LinkActionType;
+use Kreyu\Bundle\DataTableBundle\Action\Type\ModalActionType;
 use Kreyu\Bundle\DataTableBundle\Action\Type\ResolvedActionTypeFactory;
 use Kreyu\Bundle\DataTableBundle\Action\Type\ResolvedActionTypeFactoryInterface;
 use Symfony\Component\DependencyInjection\Loader\Configurator\ContainerConfigurator;
@@ -60,4 +61,10 @@
         ->set('kreyu_data_table.action.type.form', FormActionType::class)
         ->tag('kreyu_data_table.action.type')
     ;
+
+    $services
+        ->set('kreyu_data_table.action.type.modal', ModalActionType::class)
+        ->tag('kreyu_data_table.action.type')
+        ->args([service('router')])
+    ;
 };
diff --git a/src/Resources/views/themes/base.html.twig b/src/Resources/views/themes/base.html.twig
index fafa635e..b574e748 100755
--- a/src/Resources/views/themes/base.html.twig
+++ b/src/Resources/views/themes/base.html.twig
@@ -632,6 +632,18 @@
     </form>
 {% endblock %}
 
+{% block action_modal_control %}
+    {% set attr = { dataUrl }|filter(v => v != null)|merge(attr|default({})) %}
+
+    {% if batch %}
+        {% set attr = { 'data-kreyu--data-table-bundle--batch-target': 'identifierHolder' }|merge(attr) %}
+    {% endif %}
+
+    <button {% with { attr } %}{{- block('attributes') -}}{% endwith %}>
+        {% with { attr: {} } %}{{- block('action_control', theme, _context) -}}{% endwith %}
+    </button>
+{% endblock %}
+
 {% block sort_arrow_none %}{% endblock %}
 
 {% block sort_arrow_asc %}↑{% endblock %}
diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig
index 6767e24f..2c0359a8 100755
--- a/src/Resources/views/themes/bootstrap_5.html.twig
+++ b/src/Resources/views/themes/bootstrap_5.html.twig
@@ -723,6 +723,32 @@
     {% endif %}
 {% endblock %}
 
+
+{% block action_modal_control %}
+<div
+    data-controller="kreyu--data-table-bundle--bootstrap-modal"
+    data-kreyu--data-table-bundle--bootstrap-modal-url-value="{{ dataUrl }}"
+>
+    {% set modalId = 'modalId-' ~ random() %}
+    <button
+            data-action="kreyu--data-table-bundle--bootstrap-modal#open"
+            type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#{{ modalId }}">
+        {% with { attr: {} } %}{{- block('action_control', theme, _context) -}}{% endwith %}
+    </button>
+
+    <div class="modal fade" id="{{ modalId }}" tabindex="-1" aria-labelledby="{{ modalId }}Label" aria-hidden="true"
+         data-kreyu--data-table-bundle--bootstrap-modal-target="modal">
+        <div class="modal-dialog">
+            <div class="modal-content">
+                <div class="modal-body">
+                    Loading...
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+{% endblock %}
+
 {% block sort_arrow_none %}
     <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-chevron-expand" viewBox="0 0 16 16">
         <path fill-rule="evenodd" d="M3.646 9.146a.5.5 0 0 1 .708 0L8 12.793l3.646-3.647a.5.5 0 0 1 .708.708l-4 4a.5.5 0 0 1-.708 0l-4-4a.5.5 0 0 1 0-.708zm0-2.292a.5.5 0 0 0 .708 0L8 3.207l3.646 3.647a.5.5 0 0 0 .708-.708l-4-4a.5.5 0 0 0-.708 0l-4 4a.5.5 0 0 0 0 .708z"/>

From e23b71b2658c217ec1a568465dd3ca7f9f4a577e Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Thu, 9 Jan 2025 11:31:41 +0100
Subject: [PATCH 2/6] Make the modal work with batch actions

---
 assets/controllers/batch.js                      | 11 ++++++++---
 assets/package.json                              |  2 +-
 src/Action/Type/ModalActionType.php              |  8 +++++---
 src/Resources/views/themes/base.html.twig        |  2 +-
 src/Resources/views/themes/bootstrap_5.html.twig |  7 ++++++-
 5 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/assets/controllers/batch.js b/assets/controllers/batch.js
index 0336964e..d31a5fc9 100755
--- a/assets/controllers/batch.js
+++ b/assets/controllers/batch.js
@@ -90,10 +90,15 @@ export default class extends Controller {
 
     #updateIdentifierHolderHref(identifierHolder, identifierMap) {
         let href;
+        let hrefHolder =  'href';
+
+        if (identifierHolder.dataset.hrefHolder !== undefined) {
+            hrefHolder = identifierHolder.dataset.hrefHolder;
+        }
 
         try {
-            href = new URL(identifierHolder.href);
-        } catch (exception) {
+            href = new URL(identifierHolder.dataset[hrefHolder]);
+        } catch (exception) {console.log(exception)
             return;
         }
 
@@ -111,7 +116,7 @@ export default class extends Controller {
             }
         }
 
-        identifierHolder.href = href.toString();
+        identifierHolder.dataset[hrefHolder] = href.toString();
     }
 
     #updateIdentifierHolderDataParam(identifierHolder, identifierMap) {
diff --git a/assets/package.json b/assets/package.json
index ff580e13..a8a8d2cc 100755
--- a/assets/package.json
+++ b/assets/package.json
@@ -23,7 +23,7 @@
             "bootstrap-modal": {
                 "main": "controllers/bootstrap/modal.js",
                 "fetch": "eager",
-                "enabled": true
+                "enabled": false
             }
         },
         "importmap": {
diff --git a/src/Action/Type/ModalActionType.php b/src/Action/Type/ModalActionType.php
index 1fdd053c..5112d021 100755
--- a/src/Action/Type/ModalActionType.php
+++ b/src/Action/Type/ModalActionType.php
@@ -40,7 +40,7 @@ public function buildView(ActionView $view, ActionInterface $action, array $opti
             }
         }
 
-        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params']);
+        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params'], RouterInterface::ABSOLUTE_URL);
 
         $view->vars = array_replace($view->vars, [
             'href' => $href,
@@ -51,7 +51,8 @@ public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver
             ->define('route')
-            ->allowedTypes('string', 'callable')
+            ->default(null)
+            ->allowedTypes('null', 'string', 'callable')
         ;
 
         $resolver
@@ -62,7 +63,8 @@ public function configureOptions(OptionsResolver $resolver): void
 
         $resolver
             ->define('href')
-            ->allowedTypes('string', 'callable')
+            ->default(null)
+            ->allowedTypes('null', 'string', 'callable')
         ;
     }
 }
diff --git a/src/Resources/views/themes/base.html.twig b/src/Resources/views/themes/base.html.twig
index b574e748..e363c96d 100755
--- a/src/Resources/views/themes/base.html.twig
+++ b/src/Resources/views/themes/base.html.twig
@@ -633,7 +633,7 @@
 {% endblock %}
 
 {% block action_modal_control %}
-    {% set attr = { dataUrl }|filter(v => v != null)|merge(attr|default({})) %}
+    {% set attr = { href }|filter(v => v != null)|merge(attr|default({})) %}
 
     {% if batch %}
         {% set attr = { 'data-kreyu--data-table-bundle--batch-target': 'identifierHolder' }|merge(attr) %}
diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig
index 2c0359a8..e487d223 100755
--- a/src/Resources/views/themes/bootstrap_5.html.twig
+++ b/src/Resources/views/themes/bootstrap_5.html.twig
@@ -727,7 +727,12 @@
 {% block action_modal_control %}
 <div
     data-controller="kreyu--data-table-bundle--bootstrap-modal"
-    data-kreyu--data-table-bundle--bootstrap-modal-url-value="{{ dataUrl }}"
+    data-kreyu--data-table-bundle--bootstrap-modal-url-value="{{ href }}"
+
+    {% if batch %}
+        data-kreyu--data-table-bundle--batch-target="identifierHolder"
+        data-href-holder="kreyu-DataTableBundle-BootstrapModalUrlValue"
+    {% endif %}
 >
     {% set modalId = 'modalId-' ~ random() %}
     <button

From db1f8340655b0944cabe96420f5d4df83be2d30b Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Thu, 9 Jan 2025 12:48:00 +0100
Subject: [PATCH 3/6] Remove console.log()

---
 assets/controllers/batch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/controllers/batch.js b/assets/controllers/batch.js
index d31a5fc9..7ddb83c4 100755
--- a/assets/controllers/batch.js
+++ b/assets/controllers/batch.js
@@ -98,7 +98,7 @@ export default class extends Controller {
 
         try {
             href = new URL(identifierHolder.dataset[hrefHolder]);
-        } catch (exception) {console.log(exception)
+        } catch (exception) {
             return;
         }
 

From 07af8025ddd617de9ec5734aff09708abb32a2c2 Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Thu, 9 Jan 2025 14:01:09 +0100
Subject: [PATCH 4/6] Accept relative URL in the batch controller

---
 assets/controllers/batch.js         | 2 +-
 src/Action/Type/ModalActionType.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/assets/controllers/batch.js b/assets/controllers/batch.js
index 7ddb83c4..db1ee8b0 100755
--- a/assets/controllers/batch.js
+++ b/assets/controllers/batch.js
@@ -97,7 +97,7 @@ export default class extends Controller {
         }
 
         try {
-            href = new URL(identifierHolder.dataset[hrefHolder]);
+            href = new URL(identifierHolder.dataset[hrefHolder], window.location.origin);
         } catch (exception) {
             return;
         }
diff --git a/src/Action/Type/ModalActionType.php b/src/Action/Type/ModalActionType.php
index 5112d021..4292773f 100755
--- a/src/Action/Type/ModalActionType.php
+++ b/src/Action/Type/ModalActionType.php
@@ -40,7 +40,7 @@ public function buildView(ActionView $view, ActionInterface $action, array $opti
             }
         }
 
-        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params'], RouterInterface::ABSOLUTE_URL);
+        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params']);
 
         $view->vars = array_replace($view->vars, [
             'href' => $href,

From 86c195155c1dbbdd44c867b4156e6bc0d4f4d7e1 Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Mon, 13 Jan 2025 09:36:51 +0100
Subject: [PATCH 5/6] Use UrlGeneratorInterface and add translation

---
 src/Action/Type/ModalActionType.php               | 6 +++---
 src/Resources/translations/KreyuDataTable.en.yaml | 3 ++-
 src/Resources/translations/KreyuDataTable.fr.yaml | 1 +
 src/Resources/views/themes/bootstrap_5.html.twig  | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Action/Type/ModalActionType.php b/src/Action/Type/ModalActionType.php
index 4292773f..f50431d1 100755
--- a/src/Action/Type/ModalActionType.php
+++ b/src/Action/Type/ModalActionType.php
@@ -9,12 +9,12 @@
 use Kreyu\Bundle\DataTableBundle\Column\ColumnValueView;
 use Kreyu\Bundle\DataTableBundle\Exception\LogicException;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Routing\RouterInterface;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
 final class ModalActionType extends AbstractActionType
 {
     public function __construct(
-        private readonly RouterInterface $router,
+        private readonly UrlGeneratorInterface $urlGenerator,
     ) {
     }
 
@@ -40,7 +40,7 @@ public function buildView(ActionView $view, ActionInterface $action, array $opti
             }
         }
 
-        $href = $options['href'] ?? $this->router->generate($options['route'], $options['route_params']);
+        $href = $options['href'] ?? $this->urlGenerator->generate($options['route'], $options['route_params']);
 
         $view->vars = array_replace($view->vars, [
             'href' => $href,
diff --git a/src/Resources/translations/KreyuDataTable.en.yaml b/src/Resources/translations/KreyuDataTable.en.yaml
index 6f630d7e..7c47288a 100755
--- a/src/Resources/translations/KreyuDataTable.en.yaml
+++ b/src/Resources/translations/KreyuDataTable.en.yaml
@@ -50,4 +50,5 @@ Clear all filters: Clear all filters
 Action confirmation: Action execution confirmation
 Are you sure you want to execute this action?: Are you sure you want to execute this action?
 Confirm: Confirm
-Cancel: Cancel
\ No newline at end of file
+Cancel: Cancel
+Loading: Loading
\ No newline at end of file
diff --git a/src/Resources/translations/KreyuDataTable.fr.yaml b/src/Resources/translations/KreyuDataTable.fr.yaml
index dbe307dd..1197ae2d 100644
--- a/src/Resources/translations/KreyuDataTable.fr.yaml
+++ b/src/Resources/translations/KreyuDataTable.fr.yaml
@@ -50,3 +50,4 @@ Action confirmation: Confirmation de l'action
 Are you sure you want to execute this action?: Êtes-vous sûr de vouloir exécuter cette action ?
 Confirm: Confirmer
 Cancel: Annuler
+Loading: Chargement
\ No newline at end of file
diff --git a/src/Resources/views/themes/bootstrap_5.html.twig b/src/Resources/views/themes/bootstrap_5.html.twig
index e487d223..cf5f9788 100755
--- a/src/Resources/views/themes/bootstrap_5.html.twig
+++ b/src/Resources/views/themes/bootstrap_5.html.twig
@@ -746,7 +746,7 @@
         <div class="modal-dialog">
             <div class="modal-content">
                 <div class="modal-body">
-                    Loading...
+                    {{ 'Loading'|trans }}
                 </div>
             </div>
         </div>

From 44bebc831c618ef68c21734cc4b11e494fb770fa Mon Sep 17 00:00:00 2001
From: Alexandre Castelain <alexandre.castelain@fulgens.be>
Date: Mon, 13 Jan 2025 12:09:55 +0100
Subject: [PATCH 6/6] Fix service injection

---
 src/Resources/config/actions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Resources/config/actions.php b/src/Resources/config/actions.php
index 5d95eefb..e1a0a16f 100755
--- a/src/Resources/config/actions.php
+++ b/src/Resources/config/actions.php
@@ -68,7 +68,7 @@
     $services
         ->set('kreyu_data_table.action.type.modal', ModalActionType::class)
         ->tag('kreyu_data_table.action.type')
-        ->args([UrlGeneratorInterface::class])
+        ->args([service(UrlGeneratorInterface::class)])
     ;
 
     $services