Changelog for 3.2.0

* bump PHP version

* update PHPUnit config

.github/workflows/php.yml

@@ -0,0 +1,55 @@
+name: PHP Composer
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+
+    strategy:
+      fail-fast: false
+      matrix:
+        php-version: [7.3, 7.4, 8.0, 8.1]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Setup PHP ${{ matrix.php-version }}
+      uses: shivammathur/setup-php@v2
+      with:
+        php-version: ${{ matrix.php-version }}
+        extensions: xdebug
+    - name: PHP Version
+      run: php -v
+
+    - name: PHP Lint
+      run: find . -type f -name '*.php' -exec php -l {} \; | (! grep -v "No syntax errors detected" )
+
+    - name: Validate composer.json and composer.lock
+      run: composer validate --strict
+
+    - name: Cache Composer packages
+      id: composer-cache
+      uses: actions/cache@v2
+      with:
+        path: vendor
+        key: ${{ runner.os }}-php${{ matrix.php-version }}-${{ hashFiles('**/composer.lock') }}
+        restore-keys: |
+          ${{ runner.os }}-php${{ matrix.php-version }}-
+
+    - name: Install dependencies
+      run: composer update --prefer-dist --no-progress --no-scripts
+
+    - name: PHPUnit
+      run: php -d xdebug.mode=coverage vendor/bin/phpunit --log-junit junit.xml
+
+    - name: Publish Unit Test Results
+      uses: EnricoMi/publish-unit-test-result-action@v1
+      if: always()
+      with:
+        files: junit.xml

.gitignore

@@ -3,3 +3,4 @@ composer.lock
 .phpunit.result.cache
 .php_cs.cache
 .php_cs
+.php-cs-fixer.cache

.php-cs-fixer.dist.php

@@ -2,7 +2,7 @@
 
 $finder = PhpCsFixer\Finder::create()->in(__DIR__.'/src');
 
-return PhpCsFixer\Config::create()
+return (new PhpCsFixer\Config())
     ->setRules([
         '@Symfony' => true,
         'declare_strict_types' => true,

CHANGELOG.md

@@ -1,3 +1,19 @@
+# Version 3.2.0
+
+* Fixed History page pagination is hidden by footer on Ibexa 3.3 #38
+* Added filter on history page to filter out jobs with 0 items
+* Date and times will now be displayed using the user defined timezone, and stored using php timezone 
+
+# Version 3.1.0
+
+* Allow `LocationCreateStruct` objects inside the `$locations` argument of `ContentCreateStructure` to have more control over the created locations.
+
+# Version 3.0.1
+
+* Bump minimum PHP version to PHP 7.3 like code-rhapsodie/dataflow-bundle dependency.
+* Allow PHP 8.x.
+* Add GitHub Action to run tests.
+
 # Version 3.0.0
 
 * Add compatibility with Ibexa Content 3.3

composer.json

@@ -41,7 +41,7 @@
         }
     },
     "require": {
-        "php": "^7.1",
+        "php": "^7.3||^8.0",
         "code-rhapsodie/dataflow-bundle": "^3.0",
         "ezsystems/ezplatform-admin-ui": "^2.3",
         "ezsystems/ezplatform-kernel": "^1.3"
@@ -53,7 +53,10 @@
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     },
     "extra": {
         "branch-alias": {

phpunit.xml

@@ -1,32 +1,21 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-
+<?xml version="1.0" encoding="UTF-8"?>
 <!-- http://www.phpunit.de/manual/current/en/appendixes.configuration.html -->
-<phpunit
-        backupGlobals="false"
-        backupStaticAttributes="false"
-        bootstrap="tests/bootstrap.php"
-        convertErrorsToExceptions="true"
-        convertNoticesToExceptions="true"
-        convertWarningsToExceptions="true"
-        colors="false"
->
-    <php>
-        <ini name="error_reporting" value="-1" />
-    </php>
-    <testsuites>
-        <testsuite name="EzDataflow tests suite">
-            <directory suffix="Test.php">./tests</directory>
-        </testsuite>
-    </testsuites>
-
-    <filter>
-        <whitelist>
-            <directory>./src/</directory>
-            <exclude>
-                <directory>tests/</directory>
-                <directory>vendor/</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" backupGlobals="false" backupStaticAttributes="false" bootstrap="tests/bootstrap.php" convertErrorsToExceptions="true" convertNoticesToExceptions="true" convertWarningsToExceptions="true" colors="false" xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.3/phpunit.xsd">
+  <coverage>
+    <include>
+      <directory>./src/</directory>
+    </include>
+    <exclude>
+      <directory>tests/</directory>
+      <directory>vendor/</directory>
+    </exclude>
+  </coverage>
+  <php>
+    <ini name="error_reporting" value="-1"/>
+  </php>
+  <testsuites>
+    <testsuite name="EzDataflow tests suite">
+      <directory suffix="Test.php">./tests</directory>
+    </testsuite>
+  </testsuites>
 </phpunit>

src/Controller/DashboardController.php

@@ -12,7 +12,6 @@ use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
 use CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway;
 use Doctrine\DBAL\Query\QueryBuilder;
 use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
 use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
 use Pagerfanta\Adapter\DoctrineDbalAdapter;
 use Pagerfanta\Pagerfanta;
@@ -27,15 +26,12 @@ class DashboardController extends Controller
 {
     /** @var JobGateway */
     private $jobGateway;
-    /** @var NotificationHandlerInterface */
-    private $notificationHandler;
     /** @var ScheduledDataflowGateway */
     private $scheduledDataflowGateway;
 
-    public function __construct(JobGateway $jobGateway, NotificationHandlerInterface $notificationHandler, ScheduledDataflowGateway $scheduledDataflowGateway)
+    public function __construct(JobGateway $jobGateway, ScheduledDataflowGateway $scheduledDataflowGateway)
     {
         $this->jobGateway = $jobGateway;
-        $this->notificationHandler = $notificationHandler;
         $this->scheduledDataflowGateway = $scheduledDataflowGateway;
     }
 
@@ -108,9 +104,11 @@ class DashboardController extends Controller
     public function history(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
+        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);
 
         return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
-            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin(), $request),
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
@@ -120,9 +118,11 @@ class DashboardController extends Controller
     public function getHistoryPage(Request $request): Response
     {
         $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
+        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);
 
         return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
-            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin(), $request),
+            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
+            'filter' => $filter,
         ]);
     }
 
@@ -143,6 +143,7 @@ class DashboardController extends Controller
     {
         $pager = new Pagerfanta(new DoctrineDbalAdapter($query, function ($queryBuilder) {
             return $queryBuilder->select('COUNT(DISTINCT id) AS total_results')
+                ->resetQueryPart('orderBy')
                 ->setMaxResults(1);
         }));
         $pager->setMaxPerPage(20);

src/Controller/JobController.php

@@ -53,10 +53,6 @@ class JobController extends Controller
 
     /**
      * @Route("/details/log/{id}", name="coderhapsodie.ezdataflow.job.log")
-     *
-     * @param int $id
-     *
-     * @return Response
      */
     public function displayLog(int $id): Response
     {

src/Controller/ScheduledDataflowController.php

@@ -58,7 +58,6 @@ class ScheduledDataflowController extends Controller
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var ScheduledDataflow $newWorkflow */
             $newWorkflow = $form->getData();
-
             try {
                 $this->scheduledDataflowGateway->save($newWorkflow);
                 $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.create.success'));

src/Core/Content/ContentCreator.php

@@ -60,9 +60,15 @@ class ContentCreator implements ContentCreatorInterface
     {
         $locationCreateStructs = [];
 
-        foreach ($locations as $locationOrIdOrRemoteId) {
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if ($locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct) {
+                $locationCreateStructs[] = $locationOrIdOrRemoteIdOrStruct;
+
+                continue;
+            }
+
             $locationCreateStructs[] = new LocationCreateStruct([
-                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteId)->id,
+                'parentLocationId' => $this->matcher->matchLocation($locationOrIdOrRemoteIdOrStruct)->id,
             ]);
         }
 

src/Core/FieldComparator/AbstractFieldComparator.php

@@ -26,7 +26,7 @@ abstract class AbstractFieldComparator implements FieldComparatorInterface
     }
 
     /**
-     * Returns true if values are equals, false otherwise
+     * Returns true if values are equals, false otherwise.
      */
     abstract protected function compareValues(Value $currentValue, Value $newValue): bool;
 }

src/Exception/InvalidArgumentTypeException.php

@@ -9,8 +9,6 @@ class InvalidArgumentTypeException extends \Exception
     /**
      * @param string|array $expectedTypes
      * @param mixed        $received
-     *
-     * @return InvalidArgumentTypeException
      */
     public static function create($expectedTypes, $received): self
     {

src/Exception/UnknownFieldException.php

@@ -6,9 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Exception;
 
 class UnknownFieldException extends \Exception
 {
-    /**
-     * @return UnknownFieldException
-     */
     public static function create(string $fieldIdentifier, string $contentTypeIdentifier): self
     {
         return new self(sprintf(

src/Filter/NotModifiedContentFilter.php

@@ -22,7 +22,6 @@ class NotModifiedContentFilter
     /** @var FieldComparatorInterface */
     private $comparator;
 
-
     public function __construct(ContentService $contentService, FieldComparatorInterface $comparator)
     {
         $this->contentService = $contentService;
@@ -43,7 +42,7 @@ class NotModifiedContentFilter
 
         foreach ($data->getFields() as $identifier => $hash) {
             $field = $content->getField($identifier, $data->getLanguageCode());
-            if ($field === null || !$this->comparator->compare($field, $hash)) {
+            if (null === $field || !$this->comparator->compare($field, $hash)) {
                 // At least one field is different, continue the dataflow.
                 return $data;
             }
@@ -51,12 +50,13 @@ class NotModifiedContentFilter
 
         // All fields are identical, filter this item out.
         $this->log('info', 'Not modified content skipped', ['id' => $data->getId(), 'remote_id' => $data->getRemoteId()]);
+
         return false;
     }
 
     private function log(string $level, string $message, array $context = [])
     {
-        if ($this->logger === null) {
+        if (null === $this->logger) {
             return;
         }
         $this->logger->log($level, $message, $context);

src/Form/CreateOneshotType.php

@@ -6,7 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 
 use CodeRhapsodie\DataflowBundle\Entity\Job;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -30,7 +29,7 @@ class CreateOneshotType extends AbstractType
                     'placeholder' => 'coderhapsodie.dataflow.options.placeholder',
                 ],
             ])
-            ->add('requestedDate', DateTimeType::class, [
+            ->add('requestedDate', UserTimezoneAwareDateTimeType::class, [
                 'label' => 'coderhapsodie.dataflow.requestedDate',
                 'years' => range(date('Y'), date('Y') + 5),
             ])

src/Form/CreateScheduledType.php

@@ -7,7 +7,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -38,7 +37,7 @@ class CreateScheduledType extends AbstractType
                 ],
                 'label' => 'coderhapsodie.dataflow.frequency',
             ])
-            ->add('next', DateTimeType::class, [
+            ->add('next', UserTimezoneAwareDateTimeType::class, [
                 'years' => range(date('Y'), date('Y') + 5),
                 'label' => 'coderhapsodie.dataflow.create.next',
             ])

src/Form/UpdateScheduledType.php

@@ -6,7 +6,6 @@ namespace CodeRhapsodie\EzDataflowBundle\Form;
 
 use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -32,7 +31,7 @@ class UpdateScheduledType extends AbstractType
                 ],
                 'label' => 'coderhapsodie.dataflow.frequency',
             ])
-            ->add('next', DateTimeType::class, [
+            ->add('next', UserTimezoneAwareDateTimeType::class, [
                 'years' => range(date('Y'), date('Y') + 5),
                 'label' => 'coderhapsodie.dataflow.update.next',
             ])

src/Form/UserTimezoneAwareDateTimeTransformer.php

@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodeRhapsodie\EzDataflowBundle\Form;
+
+use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use eZ\Publish\API\Repository\UserPreferenceService;
+use Symfony\Component\Form\DataTransformerInterface;
+
+class UserTimezoneAwareDateTimeTransformer implements DataTransformerInterface
+{
+    /** @var UserPreferenceService */
+    private $userPreferenceService;
+
+    public function __construct(UserPreferenceService $userPreferenceService)
+    {
+        $this->userPreferenceService = $userPreferenceService;
+    }
+
+    public function transform($value)
+    {
+        if (!$value instanceof \DateTimeInterface) {
+            return $value;
+        }
+
+        return (new \DateTime('now', $this->userTimezone()))->setTimestamp($value->getTimestamp());
+    }
+
+    public function reverseTransform($value)
+    {
+        if (!$value instanceof \DateTimeInterface) {
+            return $value;
+        }
+
+        $dateTimeWithUserTimeZone = new \DateTime($value->format('Y-m-d H:i:s'), $this->userTimezone());
+
+        return (new \DateTime())->setTimestamp($dateTimeWithUserTimeZone->getTimestamp());
+    }
+
+    private function userTimezone(): \DateTimeZone
+    {
+        try {
+            $tz = $this->userPreferenceService->getUserPreference('timezone')->value ?? 'UTC';
+        } catch (NotFoundException $e) {
+            $tz = 'UTC';
+        }
+
+        return new \DateTimeZone($tz);
+    }
+}

src/Form/UserTimezoneAwareDateTimeType.php

@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace CodeRhapsodie\EzDataflowBundle\Form;
+
+use eZ\Publish\API\Repository\UserPreferenceService;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class UserTimezoneAwareDateTimeType extends AbstractType
+{
+    /** @var UserPreferenceService */
+    private $userPreferenceService;
+
+    public function __construct(UserPreferenceService $userPreferenceService)
+    {
+        $this->userPreferenceService = $userPreferenceService;
+    }
+
+    public function getParent()
+    {
+        return DateTimeType::class;
+    }
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->addModelTransformer(new UserTimezoneAwareDateTimeTransformer($this->userPreferenceService));
+    }
+}

src/Gateway/JobGateway.php

@@ -10,6 +10,9 @@ use Doctrine\DBAL\Query\QueryBuilder;
 
 final class JobGateway
 {
+    public const FILTER_NONE = 0;
+    public const FILTER_NON_EMPTY = 1;
+
     /** @var JobRepository */
     private $jobRepository;
 
@@ -30,10 +33,17 @@ final class JobGateway
             ->addOrderBy('i.requested_date', 'DESC');
     }
 
-    public function getListQueryForAdmin(): QueryBuilder
+    public function getListQueryForAdmin(int $filter): QueryBuilder
     {
-        return $this->jobRepository->createQueryBuilder('w')
-            ->addOrderBy('w.requested_date', 'DESC');
+        $qb = $this->jobRepository->createQueryBuilder('w')
+            ->addOrderBy('w.requested_date', 'DESC')
+        ;
+
+        if (self::FILTER_NON_EMPTY === $filter) {
+            $qb->andWhere('w.count > 0');
+        }
+
+        return $qb;
     }
 
     public function getListQueryForScheduleAdmin(int $id): QueryBuilder

src/Model/ContentCreateStructure.php

@@ -6,6 +6,7 @@ namespace CodeRhapsodie\EzDataflowBundle\Model;
 
 use CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException;
 use eZ\Publish\API\Repository\Values\Content\Location;
+use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
 
 class ContentCreateStructure extends ContentStructure
 {
@@ -24,6 +25,7 @@ class ContentCreateStructure extends ContentStructure
      *                         <li>an integer, the id of the Location object</li>
      *                         <li>a string, the remote id of the Location object</li>
      *                         <li>a Location object</li>
+     *                         <li>a LocationCreateStruct object</li>
      *                         </ul>
      *
      * @throws InvalidArgumentTypeException
@@ -52,12 +54,13 @@ class ContentCreateStructure extends ContentStructure
      */
     private function setLocations(array $locations)
     {
-        foreach ($locations as $locationOrIdOrRemoteId) {
-            if (!is_int($locationOrIdOrRemoteId)
-                && !is_string($locationOrIdOrRemoteId)
-                && !$locationOrIdOrRemoteId instanceof Location
+        foreach ($locations as $locationOrIdOrRemoteIdOrStruct) {
+            if (!is_int($locationOrIdOrRemoteIdOrStruct)
+                && !is_string($locationOrIdOrRemoteIdOrStruct)
+                && !$locationOrIdOrRemoteIdOrStruct instanceof Location
+                && !$locationOrIdOrRemoteIdOrStruct instanceof LocationCreateStruct
             ) {
-                throw InvalidArgumentTypeException::create(['int', 'string', Location::class], $locationOrIdOrRemoteId);
+                throw InvalidArgumentTypeException::create(['int', 'string', Location::class, LocationCreateStruct::class], $locationOrIdOrRemoteIdOrStruct);
             }
         }
 

src/Model/ContentUpdateStructure.php

@@ -15,9 +15,6 @@ class ContentUpdateStructure extends ContentStructure
         $this->fields = $fields;
     }
 
-    /**
-     * @return ContentUpdateStructure
-     */
     public static function createForContentId(int $id, string $languageCode, array $fields): self
     {
         $struct = new self($languageCode, $fields);
@@ -26,9 +23,6 @@ class ContentUpdateStructure extends ContentStructure
         return $struct;
     }
 
-    /**
-     * @return ContentUpdateStructure
-     */
     public static function createForContentRemoteId(string $remoteId, string $languageCode, array $fields): self
     {
         $struct = new self($languageCode, $fields);

src/Resources/config/services.yaml

@@ -13,7 +13,6 @@ services:
             - { name: controller.service_arguments }
         arguments:
             $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
             $scheduledDataflowGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway'
         calls:
             - ['setContainer', ['@service_container']]
@@ -117,6 +116,11 @@ services:
     CodeRhapsodie\EzDataflowBundle\Form\CreateOneshotType:
         tags: ['form.type']
 
+    CodeRhapsodie\EzDataflowBundle\Form\UserTimezoneAwareDateTimeType:
+        arguments:
+            $userPreferenceService: '@eZ\Publish\API\Repository\UserPreferenceService'
+        tags: ['form.type']
+
     CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway:
         arguments:
             $scheduledDataflowRepository: '@CodeRhapsodie\DataflowBundle\Repository\ScheduledDataflowRepository'

src/Resources/translations/messages.en.yaml

@@ -21,10 +21,15 @@ coderhapsodie.ezdataflow.history.list.title: 'Executions list'
 coderhapsodie.ezdataflow.history.list.name: Name
 coderhapsodie.ezdataflow.history.list.request: 'Requested on'
 coderhapsodie.ezdataflow.history.list.count: 'Items count'
+coderhapsodie.ezdataflow.history.list.error_count: 'Errors count'
 coderhapsodie.ezdataflow.history.list.start: 'Started on'
 coderhapsodie.ezdataflow.history.list.end: 'Finished on'
 coderhapsodie.ezdataflow.history.list.view: 'View details'
 coderhapsodie.ezdataflow.history.list.status: Status
+coderhapsodie.ezdataflow.history.filter.label: Filter results
+coderhapsodie.ezdataflow.history.filter.none: All results
+coderhapsodie.ezdataflow.history.filter.non_empty_only: Only non empty
+coderhapsodie.ezdataflow.history.filter.with_error_only: Only with errors
 coderhapsodie.ezdataflow.job.status.pending: Pending
 coderhapsodie.ezdataflow.job.status.running: Running
 coderhapsodie.ezdataflow.job.status.complete: Completed

src/Resources/views/themes/admin/ezdataflow/Dashboard/history.html.twig

@@ -2,6 +2,34 @@
 
 <div class="ez-table-header">
     <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.history.list.title'|trans }}</div>
+    <div class="ez-table-header__tools">
+        <label for="ezdataflow_history_filter">{{ 'coderhapsodie.ezdataflow.history.filter.label'|trans }}</label>
+        <select id="ezdataflow_history_filter" name="filter">
+            <option value="0" {{ filter == 0 ? 'selected="selected"' }}>{{ 'coderhapsodie.ezdataflow.history.filter.none'|trans }}</option>
+            <option value="1" {{ filter == 1 ? 'selected="selected"' }}>{{ 'coderhapsodie.ezdataflow.history.filter.non_empty_only'|trans }}</option>
+        </select>
+    </div>
 </div>
 
-{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {identifier: 'ezdataflow_history_results', paginate_route: 'coderhapsodie.ezdataflow.history'} %}
+{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {
+    identifier: 'ezdataflow_history_results',
+    paginate_route: 'coderhapsodie.ezdataflow.history',
+    paginate_params: {'filter': filter}
+} %}
+
+<script>
+    (function ($) {
+        $(document).ready(function ($) {
+            // Manage ajax pagination
+            $('#ezdataflow_history_filter').change(function (e) {
+                e.preventDefault();
+                $('#loading_ezdataflow_history_results').removeClass('d-none');
+                $('#ezdataflow_history_results')
+                    .html('')
+                    .load('{{ path('coderhapsodie.ezdataflow.history') }}?filter=' + this.value + ' #ezdataflow_history_results>*', null, function () {
+                        $('#loading_ezdataflow_history_results').addClass('d-none');
+                    });
+            });
+        });
+    })(jQuery);
+</script>

src/Resources/views/themes/admin/ezdataflow/Dashboard/main.html.twig

@@ -1,5 +1,7 @@
 {% extends ["@ezdesign/layout.html.twig", "@ezdesign/ui/layout.html.twig"] %}
 
+{% block body_class %}ez-has-full-width-footer{% endblock %}
+
 {% block breadcrumbs %}
     {% include ['@ezdesign/parts/breadcrumbs.html.twig', '@ezdesign/ui/breadcrumbs.html.twig'] with { items: [
         { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
@@ -15,7 +17,7 @@
 {% endblock %}
 
 {% block content %}
-    {{ ez_render_component_group('coderhapsodie-ezdataflow', {}, '@ezdesign/ezdataflow/parts/tab/ezdataflow.html.twig') }}
+    {{ ez_render_component_group('coderhapsodie-ezdataflow', {'filter': app.request.query.get('filter', 0)}, '@ezdesign/ezdataflow/parts/tab/ezdataflow.html.twig') }}
 
     <div class="modal fade ez-modal show" id="ez-modal--history-details" tabindex="-1" role="dialog" aria-modal="true">
         <div class="modal-dialog" role="document" style="max-width: 90%">

src/Resources/views/themes/admin/ezdataflow/Dashboard/oneshot.html.twig

@@ -40,9 +40,10 @@
                         success: function (result) {
                             if (result.redirect) {
                                 if (window.location.href === result.redirect) {
-                                    document.location.reload();
+                                    window.location.reload();
                                 }
                                 window.location = result.redirect;
+                                window.location.reload();
                                 return;
                             }
 

src/Resources/views/themes/admin/ezdataflow/Dashboard/repeating.html.twig

@@ -125,9 +125,10 @@
                             success: function (result) {
                                 if (result.redirect) {
                                     if (window.location.href === result.redirect) {
-                                        document.location.reload();
+                                        window.location.reload();
                                     }
                                     window.location = result.redirect;
+                                    window.location.reload();
                                     return;
                                 }
 

src/Resources/views/themes/admin/ezdataflow/Item/details.html.twig

@@ -20,7 +20,7 @@
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.request'|trans }}</td>
-                <td>{{ item.requestedDate|date('d/m/Y H:i:s') }}</td>
+                <td>{{ date(item.requestedDate)|ez_short_datetime }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.status'|trans }}</td>
@@ -28,11 +28,11 @@
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.start'|trans }}</td>
-                <td>{{ item.startTime|date('d/m/Y H:i:s') }}</td>
+                <td>{{ item.startTime ? date(item.startTime)|ez_short_datetime : '—' }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.end'|trans }}</td>
-                <td>{{ item.endTime|date('d/m/Y H:i:s') }}</td>
+                <td>{{ item.endTime ? date(item.endTime)|ez_short_datetime : '—' }}</td>
             </tr>
             <tr>
                 <td>{{ 'coderhapsodie.ezdataflow.history.details.count'|trans }}</td>

src/Resources/views/themes/admin/ezdataflow/parts/tab/job_list.html.twig

@@ -27,10 +27,10 @@
             {% for job in pager.currentPageResults %}
                 <tr>
                     <td>{{ job.label }}</td>
-                    <td>{{ job.requested_date|date('d/m/Y H:i:s') }}</td>
-                    <td>{{ job.count|default('-') }}</td>
-                    <td>{{ job.start_time ? job.start_time|date('d/m/Y H:i:s') : '-' }}</td>
-                    <td>{{ job.end_time ? job.end_time|date('d/m/Y H:i:s') : '-' }}</td>
+                    <td>{{ date(job.requested_date)|ez_short_datetime }}</td>
+                    <td>{{ job.count|default('—') }}</td>
+                    <td>{{ job.start_time ? date(job.start_time)|ez_short_datetime : '—' }}</td>
+                    <td>{{ job.end_time ? date(job.end_time)|ez_short_datetime : '—' }}</td>
                     <td>{{ macros.translateStatus(job.status) }}</td>
                     <td class="ez-table__cell ez-table__cell--has-action-btns text-right">
                         <a href="{{ path('coderhapsodie.ezdataflow.job.details', {id: job.id}) }}"
@@ -66,7 +66,6 @@
 </div>
 
 <script>
-
     (function ($) {
         $(document).ready(function ($) {
             // Manage ajax pagination

src/Resources/views/themes/admin/ezdataflow/parts/tab/schedule_list.html.twig

@@ -24,7 +24,7 @@
                 <tr>
                     <td>{{ item.label }}</td>
                     <td>{{ item.frequency }}</td>
-                    <td>{{ item.next|date('d/m/Y H:i:s') }}</td>
+                    <td>{{ date(item.next)|ez_short_datetime }}</td>
                     <td>{{ ('coderhapsodie.ezdataflow.' ~ (item.enabled ? 'yes' : 'no'))|trans }}</td>
                     <td class="ez-table__cell ez-table__cell--has-action-btns text-right">
                         <a href="{{ path('coderhapsodie.ezdataflow.history.workflow', {id: item.id}) }}"

src/Tab/HistoryTab.php

@@ -16,7 +16,7 @@ class HistoryTab extends AbstractControllerBasedTab implements OrderedTabInterfa
      */
     public function getControllerReference(array $parameters): ControllerReference
     {
-        return new ControllerReference(DashboardController::class.'::history');
+        return new ControllerReference(DashboardController::class.'::history', [], $parameters);
     }
 
     /**

src/Writer/ContentWriter.php

@@ -10,7 +10,6 @@ use CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-
 use Psr\Log\LoggerAwareTrait;
 
 class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
@@ -35,20 +34,23 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
     public function write($item)
     {
         if (!$item instanceof ContentStructure) {
-            $this->log('warning', "Data is not a ContentStucture");
+            $this->log('warning', 'Data is not a ContentStucture');
+
             return;
         }
 
         if ($item instanceof ContentCreateStructure) {
             $this->log('info', 'Save content', [
                 'content_type' => $item->getContentTypeIdentifier(),
-                'content_location' => $item->getLocations()
+                'content_location' => $item->getLocations(),
             ]);
+
             return $this->creator->createFromStructure($item);
         }
 
         if ($item instanceof ContentUpdateStructure) {
             $this->log('info', 'Update content', ['id' => $item->getId(), 'remote_id' => $item->getRemoteId()]);
+
             return $this->updater->updateFromStructure($item);
         }
     }
@@ -63,7 +65,7 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
 
     private function log(string $level, string $message, array $context = [])
     {
-        if ($this->logger === null) {
+        if (null === $this->logger) {
             return;
         }
         $this->logger->log($level, $message, $context);