add removeQueued

noodle69 · Jun 21, 2018 · f602473 · f602473
1 parent 72ea670
commit f602473
Show file tree

Hide file tree

Showing 6 changed files with 57 additions and 8 deletions.
diff --git a/src/bundle/Controller/CronController.php b/src/bundle/Controller/CronController.php
@@ -91,11 +91,11 @@ public function listAction(): Response
      * Update cron informations.
      *
      * @param Request $request
-     * @param $alias
+     * @param string $alias
      *
      * @return Response
      */
-    public function updateAction(Request $request, $alias): Response
+    public function updateAction(Request $request, string $alias): Response
     {
         $this->permissionAccess('uicron', 'update');
 
@@ -146,6 +146,33 @@ public function updateAction(Request $request, $alias): Response
         ]);
     }
 
+    /**
+     * @param Request $request
+     * @param string  $alias
+     * @return Response
+     */
+    public function resetAction(Request $request, string $alias): Response
+    {
+        $this->permissionAccess('uicron', 'reset');
+
+        $cron = $this->cronService->getCron($alias);
+        if (!$cron) {
+            return $this->redirect('ezplatform.dashboard');
+        }
+
+        $this->cronService->removeQueud($alias);
+
+        $this->notificationHandler->info(
+            $this->translator->trans(
+                'edgar.ezuicron.reset.info',
+                [],
+                'edgarezuicron'
+            )
+        );
+
+        return $this->redirect('ezplatform.dashboard');
+    }
+
     /**
      * Check if user has permissions to access cron functions.
      *

diff --git a/src/bundle/Resources/config/policies.yml b/src/bundle/Resources/config/policies.yml
@@ -1,4 +1,5 @@
 uicron:
     list: ~
     update: ~
+    reset: ~
     dashboard: ~
diff --git a/src/bundle/Resources/config/routing.yml b/src/bundle/Resources/config/routing.yml
@@ -1,10 +1,14 @@
 edgar.ezuicron.list:
-    path: /cron/list
+    path: /list
     defaults:
         _controller: 'EdgarEzUICronBundle:Cron:list'
 
 edgar.ezuicron.update:
-    path: /cron/update/{alias}
+    path: /update/{alias}
     defaults:
-        alias: null
         _controller: 'EdgarEzUICronBundle:Cron:update'
+
+edgar.ezuicron.reset:
+    path: /reset/{alias}
+    defaults:
+        _controller: 'EdgarEzUICronBundle:Cron:reset'
diff --git a/src/bundle/Resources/views/dashboard/tab/cron.html.twig b/src/bundle/Resources/views/dashboard/tab/cron.html.twig
@@ -8,6 +8,7 @@
         <th>{{ 'edgarezcron.status.th.started'|trans|desc('Started') }}</th>
         <th>{{ 'edgarezcron.status.th.ended'|trans|desc('Ended') }}</th>
         <th>{{ 'edgarezcron.status.th.status'|trans|desc('Status') }}</th>
+        <th></th>
     </tr>
     </thead>
     <tbody>
@@ -25,6 +26,11 @@
                     <td>{{ cron.started|localizeddate('short', 'short', app.request.locale) }}</td>
                     <td>{{ cron.ended|localizeddate('short', 'short', app.request.locale) }}</td>
                     <td>{{ cron.status }}</td>
+                    <td>
+                        {% if cron.reset %}
+                            <a href="{{ path('edgar.ezuicron.reset', {'alias': cron.alias}) }}">{{ 'edgarezcron.status.td.reset'|trans|desc('Reset') }}</a>
+                        {% endif %}
+                    </td>
                 </tr>
             {% endfor %}
         {% endif %}

diff --git a/src/bundle/Service/EzCronService.php b/src/bundle/Service/EzCronService.php
@@ -176,6 +176,14 @@ public function addQueued(string $alias)
         $this->cronService->addQueued($alias);
     }
 
+    /**
+     * @param string $alias
+     */
+    public function removeQueud(string $alias)
+    {
+        $this->cronService->removeQueued($alias);
+    }
+
     /**
      * Run crons in queue.
      *

diff --git a/src/lib/Tab/Dashboard/CronTab.php b/src/lib/Tab/Dashboard/CronTab.php
@@ -76,12 +76,11 @@ public function getOrder(): int
 
     /**
      * @param array $parameters
-     *
      * @return string
-     *
      * @throws \Twig_Error_Loader
      * @throws \Twig_Error_Runtime
      * @throws \Twig_Error_Syntax
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     public function renderView(array $parameters): string
     {
@@ -96,16 +95,19 @@ public function renderView(array $parameters): string
         $cronRows = [];
         foreach ($crons as $cron) {
             $cronStatus = '';
+            $cronReset = false;
             if ($cron instanceof EdgarCron) {
                 switch ($cron->getStatus()) {
                     case EdgarCronRepository::STATUS_INIT:
                         $cronStatus = $this->translator->trans('Init', [], 'edgarezcron');
+                        $cronReset = true;
                         break;
                     case EdgarCronRepository::STATUS_OK:
                         $cronStatus = $this->translator->trans('OK', [], 'edgarezcron');
                         break;
                     case EdgarCronRepository::STATUS_ERROR:
                         $cronStatus = $this->translator->trans('Error', [], 'edgarezcron');
+                        $cronReset = true;
                         break;
                     default:
                         $cronStatus = '';
@@ -125,6 +127,7 @@ public function renderView(array $parameters): string
                     ? $cron->getEnded() : false)
                     : false,
                 'status' => $cronStatus,
+                'reset' => $cronReset,
             ];
         }
 
@@ -136,8 +139,8 @@ public function renderView(array $parameters): string
     /**
      * @param string $module
      * @param string $function
-     *
      * @return bool
+     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
      */
     protected function permissionAccess(string $module, string $function): bool
     {