Add mass action count to confirmation message (#16)

webgriffe · Sep 21, 2020 · 0f2a89a · 0f2a89a
1 parent 35c2c2e
commit 0f2a89a
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/src/Console/Controller/FlowController.php b/src/Console/Controller/FlowController.php
@@ -28,6 +28,7 @@ public function __invoke(Request $request, string $flowCode): Promise
             $query = $queryParams['query'] ?? '';
             $page = (int)($queryParams['page'] ?? '1');
             $massActionSuccess = $queryParams['massActionSuccess'] ?? false;
+            $massActionCount = $queryParams['massActionCount'] ?? 0;
             $adapter = new AmpElasticsearchUriSearchAdapter(
                 $this->getElasticsearch()->getClient(),
                 $flowCode,
@@ -45,7 +46,8 @@ public function __invoke(Request $request, string $flowCode): Promise
                         'flowCode' => $flowCode,
                         'pager' => $pager,
                         'query' => $query,
-                        'massActionSuccess' => $massActionSuccess
+                        'massActionSuccess' => $massActionSuccess,
+                        'massActionCount' => $massActionCount
                     ]
                 )
             );

diff --git a/src/Console/Controller/MassActionController.php b/src/Console/Controller/MassActionController.php
@@ -62,8 +62,9 @@ public function __invoke(Request $request, string $flow): Promise
             if ($action === self::ACTION_REQUEUE) {
                 yield from $this->requeue($jobs, $flow);
             }
+            $jobsCount = count($jobs);
 
-            return new Response(302, ['Location' => ["/flow/$flow?massActionSuccess=$action"]]);
+            return new Response(302, ['Location' => ["/flow/$flow?massActionSuccess=$action&massActionCount=$jobsCount"]]);
         });
     }
 

diff --git a/src/Console/Resources/views/flow.html.twig b/src/Console/Resources/views/flow.html.twig
@@ -8,7 +8,11 @@
 
     {% if massActionSuccess == 'requeue' %}
         <div class="alert alert-success" role="alert">
-            Selected jobs has been successfully re-queued!
+            {% if massActionCount is not defined %}
+                Selected jobs has been successfully re-queued!
+            {% else %}
+                {{ massActionCount }} selected job(s) has been successfully re-queued!
+            {% endif %}
         </div>
     {% endif %}