Merge branch 'feature/batch' into develop

src/core/Controller/Admin/Crud/CrudController.php

@@ -162,7 +162,7 @@ abstract class CrudController extends AdminController
 
         $lastRequest = $session->get($lastRequestId);
 
-        if ($lastRequest !== null && !$request->isMethod('POST')) {
+        if (null !== $lastRequest && !$request->isMethod('POST')) {
             $fakeRequest = Request::create(
                 uri: $request->getUri(),
                 method: 'POST',
@@ -284,16 +284,25 @@ abstract class CrudController extends AdminController
 
         $query->useFilters($this->filters);
 
+        $useSelection = 'selection' === $target;
+
+        if ($batchAction['isGlobal']) {
+            $result = $callback($query, $useSelection, $entityManager);
+
+            if ($result instanceof Response) {
+                return $result;
+            }
+
+            return $this->redirect($request->query->get('redirectTo'));
+        }
         if ('selection' === $target) {
-            $isSelection = true;
             $pager = $query->paginate($page, $configuration->getMaxPerPage($context));
         } else {
-            $isSelection = false;
             $pager = $query->find();
         }
 
         foreach ($pager as $key => $entity) {
-            if (($isSelection && isset($items[$key + 1])) || !$isSelection) {
+            if (($useSelection && isset($items[$key + 1])) || !$useSelection) {
                 $callback($entity, $entityManager);
             }
         }

src/core/Crud/CrudConfiguration.php

@@ -135,7 +135,25 @@ class CrudConfiguration
         );
     }
 
-    public function setBatchAction(string $page, string $action, string $label, callable $callback): self
+    public function setGlobalBatchAction(
+        string $page,
+        string $action,
+        string $label,
+        callable $callback
+    ): self
+    {
+        $this->setBatchAction($page, $action, $name);
+        $this->batchActions[$page][$action]['isGlobal'] = true;
+
+        return $this;
+    }
+
+    public function setBatchAction(
+        string $page,
+        string $action,
+        string $label,
+        callable $callback
+    ): self
     {
         if (!isset($this->batchActions[$page])) {
             $this->batchActions[$page] = [];
@@ -144,6 +162,7 @@ class CrudConfiguration
         $this->batchActions[$page][$action] = [
             'label' => $label,
             'callback' => $callback,
+            'isGlobal' => false
         ];
 
         return $this;

src/core/Resources/assets/js/modules/batch.js

@@ -8,16 +8,28 @@ module.exports = () => {
   const form = $('#form-batch')
 
   form.submit((e) => {
-    e.preventDefault()
+    const select = document.querySelector('#form-batch-action')
+    const options = select.querySelectorAll('#form-batch-action option')
+    let doPrevent = true
 
-    const route = form.attr('action')
+    options.forEach((option) => {
-    const datas = form.serialize()
+      if (option.value === select.value && option.getAttribute('data-isglobal') === 'true') {
+        doPrevent = false
+      }
+    })
 
-    form.addClass('is-loading')
+    if (doPrevent) {
+      e.preventDefault()
 
-    $.post(route, datas)
+      const route = form.attr('action')
-      .always(() => {
+      const datas = form.serialize()
-        document.location.reload()
+
-      })
+      form.addClass('is-loading')
+
+      $.post(route, datas)
+        .always(() => {
+          document.location.reload()
+        })
+    }
   })
 }

src/core/Resources/views/admin/crud/index.html.twig

@@ -283,15 +283,18 @@
 
                                             {% if configuration.hasBatchAction(context) %}
                                                 <div class="mb-2">
-                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {page: pager.currentPageNumber}|merge(configuration.pageRouteParams('batch'))) }}" id="form-batch" method="POST">
+                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {
+                                                        page: pager.currentPageNumber,
+                                                        redirectTo: app.request.uri
+                                                    }|merge(configuration.pageRouteParams('batch'))) }}" id="form-batch" method="POST">
                                                         <select class="form-control my-1 mr-sm-2" name="batch[target]">
                                                             <option value="selection">{{ 'For selection'|trans }}</option>
                                                             <option value="all">{{ 'For all items'|trans }}</option>
                                                         </select>
-                                                        <select class="form-control my-1 mr-sm-2" name="batch[action]">
+                                                        <select class="form-control my-1 mr-sm-2" id="form-batch-action" name="batch[action]">
                                                             <option value=""></option>
                                                             {% for action, conf in configuration.batchActions(context) %}
-                                                                <option value="{{ action }}">
+                                                                <option value="{{ action }}" {% if conf.isGlobal %}data-isglobal="true"{% endif %}>
                                                                     {{ conf.label|trans }}
                                                                 </option>
                                                             {% endfor %}