fix: issue with job pause management

Author: erdnaxelaweb

src/bundle/Controller/Admin/JobController.php

@@ -188,6 +188,15 @@ public function run(Job $job, int $batchLimit = null, bool $reset = false): Resp
         ]));
     }
 
+    public function pause(Job $job): Response
+    {
+        $this->jobService->pause($job);
+
+        return new RedirectResponse($this->generateUrl('import_export.job.view', [
+            'id' => $job->getId(),
+        ]));
+    }
+
     public function cancel(Job $job): Response
     {
         $this->jobService->cancelJob($job);

src/bundle/Resources/config/routes.yaml

@@ -15,6 +15,10 @@ import_export.job.run:
     path:     /import-export/job/{id}/run
     defaults: { _controller: AlmaviaCX\Bundle\IbexaImportExportBundle\Controller\Admin\JobController::run }
 
+import_export.job.pause:
+    path:     /import-export/job/{id}/pause
+    defaults: { _controller: AlmaviaCX\Bundle\IbexaImportExportBundle\Controller\Admin\JobController::pause }
+
 import_export.job.cancel:
     path:     /import-export/job/{id}/cancel
     defaults: { _controller: AlmaviaCX\Bundle\IbexaImportExportBundle\Controller\Admin\JobController::cancel }

src/bundle/Resources/translations/import_export.en.yaml

@@ -17,6 +17,7 @@ job.run: Run
 job.status.canceled: Canceled
 job.status.completed: Completed
 job.status.paused: Paused
+job.status.force_paused: Paused
 job.status.pending: Pending
 job.status.queued: Queued
 job.status.running: Running

src/bundle/Resources/translations/import_export.fr.yaml

@@ -17,6 +17,7 @@ job.run: Lancer
 job.status.canceled: Annulé
 job.status.completed: Complété
 job.status.paused: 'En pause'
+job.status.force_paused: 'En pause'
 job.status.pending: 'En attente'
 job.status.queued: 'Dans la file'
 job.status.running: 'En cours'

src/bundle/Resources/views/themes/admin/import_export/job/list.html.twig

@@ -52,8 +52,8 @@
             'job.status.completed'|trans()|desc('Completed'),
             'job.status.queued'|trans()|desc('Queued'),
             'job.status.paused'|trans()|desc('Paused'),
-            'job.status.canceled'|trans()|desc('Canceled')
-
+            'job.status.canceled'|trans()|desc('Canceled'),
+            'job.status.force_paused'|trans()|desc('Paused')
         ] %}
         {% set show_table_notice = false %}
 

src/bundle/Resources/views/themes/admin/import_export/job/view.html.twig

@@ -32,8 +32,8 @@
         'job.status.completed'|trans()|desc('Completed'),
         'job.status.queued'|trans()|desc('Queued'),
         'job.status.paused'|trans()|desc('Paused'),
-        'job.status.canceled'|trans()|desc('Canceled')
-
+        'job.status.canceled'|trans()|desc('Canceled'),
+        'job.status.force_paused'|trans()|desc('Paused')
     ] %}
     {% set progress_bar %}</div>
         {% include '@ibexadesign/import_export/components/progress_bar.html.twig' with {processedCount: job.processedItemsCount, totalCount: job.totalItemsCount} only %}
@@ -82,7 +82,18 @@
                     {{ 'job.cancel'|trans|desc('Cancel') }}
                 </span>
             </a>
-        {% endif %}
+            <a
+                    href="{{ path('import_export.job.pause', {'id': job.id}) }}"
+                    class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <use xlink:href="{{ ibexa_icon_path('interface-block') }}"></use>
+                </svg>
+                <span class="ibexa-btn__label">
+                    {{ 'job.pause'|trans|desc('pause') }}
+                </span>
+            </a>
+        {% else %}
             <a
                     href="{{ path('import_export.job.run', {'id': job.id}) }}"
                     class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
@@ -94,6 +105,7 @@
                     {{ 'job.run'|trans|desc('Run') }}
                 </span>
             </a>
+        {% endif %}
     {% endset %}
 
     <section class="container ibexa-container">

src/lib/AdminUi/Menu/Event/MenuListener.php

@@ -7,7 +7,6 @@
 use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
 use Ibexa\AdminUi\Menu\MainMenuBuilder;
 use Ibexa\Contracts\Core\Repository\PermissionResolver;
-use Ibexa\Core\Base\Exceptions\UnauthorizedException;
 use JMS\TranslationBundle\Model\Message;
 use JMS\TranslationBundle\Translation\TranslationContainerInterface;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

src/lib/Job/AbstractJobRunner.php

@@ -23,11 +23,11 @@ public function __invoke(Job $job, int $batchLimit = -1, bool $reset = false): i
             $job->reset();
         }
 
-        if (Job::STATUS_PAUSED !== $job->getStatus() || Job::STATUS_PENDING !== $job->getStatus()) {
-            return $this->run($job, $batchLimit);
+        if (!$job->isPending()) {
+            return $job->getStatus();
         }
 
-        return $job->getStatus();
+        return $this->run($job, $batchLimit);
     }
 
     abstract protected function run(Job $job, int $batchLimit = -1): int;

src/lib/Job/AsyncJobRunner.php

@@ -24,10 +24,13 @@ public function __construct(
 
     protected function run(Job $job, int $batchLimit = -1): int
     {
-        $job->setStatus(Job::STATUS_QUEUED);
-        $this->jobRepository->save($job);
-
-        $this->jobRunMessageHandler->triggerStart($job, $batchLimit);
+        if ($job->isPaused()) {
+            $this->jobRunMessageHandler->triggerResume($job, $batchLimit);
+        } else {
+            $job->setStatus(Job::STATUS_QUEUED);
+            $this->jobRepository->save($job);
+            $this->jobRunMessageHandler->triggerStart($job, $batchLimit);
+        }
 
         return $job->getStatus();
     }

src/lib/Job/Job.php

@@ -24,6 +24,7 @@ class Job
     public const STATUS_COMPLETED = 2;
     public const STATUS_QUEUED = 3;
     public const STATUS_PAUSED = 4;
+    public const STATUS_FORCE_PAUSED = 6;
     public const STATUS_CANCELED = 5;
 
     /**
@@ -306,4 +307,14 @@ public function isRunning(): bool
     {
         return self::STATUS_RUNNING === $this->status;
     }
+
+    public function isPaused(): bool
+    {
+        return in_array($this->status, [self::STATUS_PAUSED, self::STATUS_FORCE_PAUSED]);
+    }
+
+    public function isPending(): bool
+    {
+        return self::STATUS_PENDING === $this->status || $this->isPaused();
+    }
 }