Updated CHANGELOG

Fix redirection after adding a new oneshot job
Fix main menu label
2026-03-24 06:32:06 +01:00 · 2024-03-15 11:32:03 +01:00 · 2024-03-15 11:28:11 +01:00 · 2024-03-15 11:27:52 +01:00 · 2024-02-05 15:52:11 +01:00 · 2023-12-27 18:53:20 +01:00
65 changed files with 952 additions and 798 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -0,0 +1,27 @@
+name: Build
+
+on:
+  push:
+    branches:
+      - master
+
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-latest
+    permissions: read-all
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
+      - uses: sonarsource/sonarqube-scan-action@master
+        env:
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+          SONAR_HOST_URL: ${{ secrets.SONAR_HOST_URL }}
+      # If you wish to fail your job when the Quality Gate is red, uncomment the
+      # following lines. This would typically be used to fail a deployment.
+      # - uses: sonarsource/sonarqube-quality-gate-action@master
+      #   timeout-minutes: 5
+      #   env:
+      #     SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
--- a/.github/workflows/php.yml
+++ b/.github/workflows/php.yml
@@ -12,7 +12,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        php-version: [7.3, 7.4, 8.0, 8.1]
+        php-version: [7.4, 8.0, 8.1, 8.2]

    runs-on: ubuntu-latest

--- a/.github/workflows/semicolons-kudos.yaml
+++ b/.github/workflows/semicolons-kudos.yaml
@@ -0,0 +1,26 @@
+
+name: Kudos for Code
+on:
+  push:
+    branches: ["master"]
+  workflow_dispatch:
+
+jobs:
+  kudos:
+    name: Semicolons Kudos
+    permissions: write-all
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: LoremLabs/kudos-for-code-action@latest
+        with:
+          search-dir: "."
+          destination: "artifact"
+          generate-nomerges: true
+          generate-validemails: true
+          generate-limitdepth: 0
+          generate-fromrepo: true
+          analyze-repo: false
+          skip-ids: ""
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,20 @@
+# Version 4.1.2
+
+* Fix main menu label
+* Fix redirection after adding a new oneshot job
+
+# Version 4.1.1
+
+* Fix NotModifiedContentFilter when creating new translation
+
+# Version 4.1.0
+
+* Allow Dataflow 4 by @jeremycr in https://github.com/code-rhapsodie/ezdataflow-bundle/pull/44
+
+# Version 4.0.0
+
+* Add compatibility with Ibexa 4.0+ and drop compatibility for eZPlatform 2 and Ibexa 3 
+
 # Version 3.2.0

 * Fixed History page pagination is hidden by footer on Ibexa 3.3 #38
--- a/README.md
+++ b/README.md
@@ -1,18 +1,29 @@
 # Code Rhapsodie eZ Dataflow Bundle

-EzDataflowBundle is a bundle integrating [Code Rhapsodie Dataflow bundle](https://github.com/code-rhapsodie/dataflow-bundle) into eZ Platfom 2.0+.
-Dataflows can be piloted from an interface integrated in eZ Platform backoffice.
+EzDataflowBundle is a bundle
+integrating [Code Rhapsodie Dataflow bundle](https://github.com/code-rhapsodie/dataflow-bundle) into Ibexa 4.0+.
+Dataflows can be piloted from an interface integrated into the Ibexa backoffice.
 EzDataflow bundle is intended to manage content imports from external data sources.

-> Note: before using this bundle, please read the [Code Rhapsodie Dataflow bundle documentation](https://github.com/code-rhapsodie/dataflow-bundle/blob/master/README.md).
+> Note: before using this bundle, please read
+> the [Code Rhapsodie Dataflow bundle documentation](https://github.com/code-rhapsodie/dataflow-bundle/blob/master/README.md).

-> Command line notice: When you use Dataflow commands, **use `--siteaccess` instead of `--connection`** expect for `code-rhapsodie:dataflow:dump-schema` command.
+> Command line notice: When you use Dataflow commands, **use `--siteaccess` instead of `--connection`** expect
+> for `code-rhapsodie:dataflow:dump-schema` command.
+
+| eZ Dataflow Version | Ibexa Content Version | Status                       |
+|---------------------|-----------------------|------------------------------|
+| 4.x                 | 4.x                   | :white_check_mark: Maintened |
+| 3.x                 | 3.x                   | :white_check_mark: Maintened |
+| 2.x                 | eZ Platform 2.5       | :x: Not maintened            |
+| 1.x                 | eZ Platform 2.5       | :x: Not maintained           |

 ## User Interface (UI)

 The UI lets you create workflow processes from any defined `DataflowTypes`, and set options to each.

 Processes can be set to run either:
+
 - only once, at a given date and time
 - regularly, by defining the first run date and time, and the interval between subsequent runs

@@ -26,11 +37,10 @@ $ composer require code-rhapsodie/ezdataflow-bundle

 ### Step 2: Enable the bundle

-> Note: The loading order between the Dataflow bundle and Ez Dataflow bundle is important. Dataflow must be loaded first.
+> Note: The loading order between the Dataflow bundle and Ez Dataflow bundle is important. Dataflow must be loaded
+> first.

-#### Symfony 4 (new tree)
-
-For Symfony 4, add those two lines in the `config/bundles.php` file:
+Add those two lines in the `config/bundles.php` file:

 ```php
 <?php
@@ -43,65 +53,51 @@ return [
 ];
 ```

-#### Symfony 3.4 (old tree)
-
-For Symfony 3.4, add those two lines in the `app/AppKernel.php` file:
-
-```php
-<?php
-// app/AppKernel.php
-
-public function registerBundles()
-{
-    $bundles = [
-        // ...
-        new CodeRhapsodie\DataflowBundle\CodeRhapsodieDataflowBundle(),
-        new CodeRhapsodie\EzDataflowBundle\CodeRhapsodieEzDataflowBundle(),
-        // ...
-    ];
-}
-```
-
 ### Step 3: Import bundle routing file

 ```yaml
-# app/config/routing.yml or config/routing.yaml
+# config/routing/ezdataflow.yaml

 _cr.dataflow:
-    resource: '@CodeRhapsodieEzDataflowBundle/Resources/config/routing.yaml'
+  resource: '@CodeRhapsodieEzDataflowBundle/Resources/config/routing.yaml'
 ```

 ### Step 4: Update the database schema

-Please refer to the [Code-Rhapsodie Dataflow Bundle installation guide](https://github.com/code-rhapsodie/dataflow-bundle#update-the-database).
+Please refer to
+the [Code-Rhapsodie Dataflow Bundle installation guide](https://github.com/code-rhapsodie/dataflow-bundle#update-the-database).

 ### Step 5: Schedule the job runner

-Please refer to the [Code-Rhapsodie Dataflow Bundle Queue section](https://github.com/code-rhapsodie/dataflow-bundle#queue).
+Please refer to
+the [Code-Rhapsodie Dataflow Bundle Queue section](https://github.com/code-rhapsodie/dataflow-bundle#queue).

 ## Configuration

-By default, the `ContentWriter` will publish contents using the `admin` user. If you want to use another user (with sufficient permissions), you can configure it like this:
+By default, the `ContentWriter` will publish contents using the `admin` user. If you want to use another user (with
+sufficient permissions), you can configure it like this:

 ```yaml
-# app/config/config.yml or config/packages/code_rhapsodie_ez_dataflow.yaml
+# config/packages/code_rhapsodie_ez_dataflow.yaml

 code_rhapsodie_ez_dataflow:
-    # Integer values are assumed to be user ids, non-integer values are assumed to be user logins
-    admin_login_or_id: webmaster
+  # Integer values are assumed to be user ids, non-integer values are assumed to be user logins
+  admin_login_or_id: webmaster
 ```

 ## Define your Dataflow

-Before using the admin UI to manage your dataflows, you need to define them. Please refer to [Code-Rhapsodie Dataflow type documentation](https://github.com/code-rhapsodie/dataflow-bundle#define-a-dataflow-type).
+Before using the admin UI to manage your dataflows, you need to define them. Please refer
+to [Code-Rhapsodie Dataflow type documentation](https://github.com/code-rhapsodie/dataflow-bundle#define-a-dataflow-type).

 ## Use the ContentWriter

-To add or update eZ Platform contents, you can use the `CodeRhapsodie\EzDataflowBundle\Writer\ContentWriter` writer.
+To add or update Ibexa contents, you can use the `CodeRhapsodie\EzDataflowBundle\Writer\ContentWriter` writer.

 ### Step 1: Inject the dependencies and add the writer

-Inject the `ContentWriter` service into the constructor of your DataflowType and add the content writer into the writer list like this:
+Inject the `ContentWriter` service into the constructor of your DataflowType and add the content writer into the writer
+list like this:

 ```php
 // In your DataflowType
@@ -133,31 +129,37 @@ class MyDataflowType extends AbstractDataflowType

 ### Step 2: Add a step for prepare the content

-To process eZ Platform content into your Dataflow, you need to transform the data into `ContentCreateStructure` or `ContentUpdateStructure` objects.
+To process Ibexa contents into your Dataflow, you need to transform the data into `ContentCreateStructure`
+or `ContentUpdateStructure` objects.
 in order to respectively create or update contents.

 But, in order to determine if the content already exists or not, you first need to look up for it.

 One way is to use the remote id to search for the content.

-In the following example, the remote id pattern is `article-<id>` with the `<id>` replaced by the data id provided by the reader.
-To check if the content exists or not, I use the service `ContentService` provided by eZ Platform.
+In the following example, the remote id pattern is `article-<id>` with the `<id>` replaced by the data id provided by
+the reader.
+To check if the content exists or not, I use the service `ContentService` provided by Ibexa.

 The step is added as an anonymous function and has 3 types of return values:

 * When the step returns `false`, the data is dropped.
-* When the step returns a `ContentCreateStructure`, the data will be saved into a new eZ Platform content.
-* When the step returns a `ContentUpdateStructure`, the existing eZ Platform content will be updated by overwriting all defined fields in the data.
+* When the step returns a `ContentCreateStructure`, the data will be saved into a new Ibexa content.
+* When the step returns a `ContentUpdateStructure`, the existing Ibexa content will be updated by overwriting all
+  defined fields in the data.

-For the new content, you must provide one or more "parent location id" as the 3rd argument of the `ContentCreateStructure` constructor.
+For the new content, you must provide one or more "parent location id" as the 3rd argument of
+the `ContentCreateStructure` constructor.

 In this example, I have added a new folder to store all articles.

-To get the location id of the parent eZ Platform content, go to the admin UI and select the future parent content, click on the details tabs, and read the "Location id" like this:
+To get the location id of the parent Ibexa content, go to the admin UI and select the future parent content, click on
+the details tabs, and read the "Location id" like this:

 ![parent folder](src/Resources/doc/dest_folder.jpg)

-> Note: the best practice is to define this parent id in your `parameters.yml` file or your `.env.local` file for each execution environment.
+> Note: the best practice is to define this parent id in your `parameters.yml` file or your `.env.local` file for each
+> execution environment.

 ```php
 // In your DataflowType
@@ -213,11 +215,13 @@ class MyDataflowType extends AbstractDataflowType
 }
 ```

-This example uses `ContentStructureFactory` to check if the content exists and returns the adequate `ContentStrucure` to pass to the content writer.
+This example uses `ContentStructureFactory` to check if the content exists and returns the adequate `ContentStrucure` to
+pass to the content writer.

 ## Use the NotModifiedContentFilter

-When updating contents, you might want to ignore contents where the update would not result in any actual changes in fields values. In that case, you can add the `NotModifiedContentFilter` as one of your steps.
+When updating contents, you might want to ignore contents where the update would not result in any actual changes in
+fields values. In that case, you can add the `NotModifiedContentFilter` as one of your steps.

 ```php
 // In your DataflowType
@@ -237,11 +241,16 @@ protected function buildDataflow(DataflowBuilder $builder, array $options): void
 }
 ```

-This filter compares each field value in the `ContentUpdateStructure` received to the fields values in the existing content object. If all values are identical, this filter will return `false`, otherwise, the `ContentUpdateStructure` will be returned as is.
+This filter compares each field value in the `ContentUpdateStructure` received to the fields values in the existing
+content object. If all values are identical, this filter will return `false`, otherwise, the `ContentUpdateStructure`
+will be returned as is.

-Not all field types are supported by this filter. Il a field type is not supported, values will be assumed different. If your dataflow is dealing with content types containing unsupported field types, it is better to simply not use the `NotModifiedContentFilter` to prevent unnecessary overhead. 
+Not all field types are supported by this filter. Il a field type is not supported, values will be assumed different. If
+your dataflow is dealing with content types containing unsupported field types, it is better to simply not use
+the `NotModifiedContentFilter` to prevent unnecessary overhead.

 ### Supported field types
+
 - ezstring
 - ezauthor
 - ezboolean
@@ -272,7 +281,7 @@ If you want to add support for a field type, simply create your own comparator.
 <?php

 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Core\FieldType\Value;
 //[...]

 class MyFieldComparator extends AbstractFieldComparator
@@ -288,17 +297,17 @@ class MyFieldComparator extends AbstractFieldComparator

 ```yaml
 # Service declaration
-    App\FieldComparator\MyFieldComparator:
-        parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
-        tags:
-            - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'my_field_type_identifier' }
+App\FieldComparator\MyFieldComparator:
+  parent: 'CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator'
+  tags:
+    - { name: 'coderhapsodie.ezdataflow.field_comparator', fieldType: 'my_field_type_identifier' }
 ```

 # Admin UI

 ## Access to the eZ Dataflow UI

-You can access the eZ Dataflow administration UI from your eZ Platform admin back-office.
+You can access the eZ Dataflow administration UI from your Ibexa admin back-office.

 ![Admin menu](src/Resources/doc/ez_dataflow_admin_menu.jpg)

@@ -314,25 +323,29 @@ When you access to the eZ Dataflow administration UI, you going here:
 1. Scheduled dataflow list
 1. Button to add a new scheduled dataflow
 1. Tools available for each scheduled dataflow. In order from left to right :
-   1. Display the history for this dataflow schedule
-   1. Edit this dataflow schedule
-   1. Enable/Disable this dataflow schedule
-   1. Delete this dataflow schedule
+    1. Display the history for this dataflow schedule
+    1. Edit this dataflow schedule
+    1. Enable/Disable this dataflow schedule
+    1. Delete this dataflow schedule

 > Note: You can define more than one schedule for any given dataflow.

 ## Add a new schedule

-Go to the eZ Dataflow admin, and click on the "+" orange button. 
+Go to the eZ Dataflow admin, and click on the "+" orange button.

 In the new popin, fill in the fields:

 ![Add a new schedule](src/Resources/doc/add_new_schedule.jpg)

 1. Type the Dataflow schedule name
-1. Select the Dataflow type. The list is automatically generated from the list of Symfony services with the tags `coderhapsodie.dataflow.type`. If your dataflow type is not present, [check the configuration](https://github.com/code-rhapsodie/dataflow-bundle#check-if-your-dataflowtype-is-ready)
-1. Type here the Dataflow options. Basic expected format: one option per line and option name and value separated with `: `. For more complex options, the whole YAML format is supported.
-1. Type here the frequency. The value must be compatible with the the PHP [strtotime](https://www.php.net/manual/en/function.strtotime.php) function.
+1. Select the Dataflow type. The list is automatically generated from the list of Symfony services with the
+   tags `coderhapsodie.dataflow.type`. If your dataflow type is not
+   present, [check the configuration](https://github.com/code-rhapsodie/dataflow-bundle#check-if-your-dataflowtype-is-ready)
+1. Type here the Dataflow options. Basic expected format: one option per line and option name and value separated
+   with `: `. For more complex options, the whole YAML format is supported.
+1. Type here the frequency. The value must be compatible with the the
+   PHP [strtotime](https://www.php.net/manual/en/function.strtotime.php) function.
 1. Choose the date and time of the first job.
 1. Check if you want to run this Dataflow.

@@ -340,7 +353,8 @@ Finally, click on the "Create" button.

 ## Read the history

-When you click on the "History" tab in the eZ Dataflow admin UI, the job history for all Dataflow configured and executed is displayed.
+When you click on the "History" tab in the eZ Dataflow admin UI, the job history for all Dataflow configured and
+executed is displayed.

 ![History list](src/Resources/doc/history_list.jpg)

@@ -377,15 +391,19 @@ Go to the eZ Dataflow admin UI and click on the "Oneshot" tab. Click on the "+"
 ![The add one-shot popin](src/Resources/doc/one_shot_job.jpg)

 1. Type the Dataflow job name
-1. Select the Dataflow type. The list is automatically generated from the list of Symfony services with the tags `coderhapsodie.dataflow.type`. If your dataflow type is not present, [check the configuration](https://github.com/code-rhapsodie/dataflow-bundle#check-if-your-dataflowtype-is-ready)
-1. Type here the Dataflow options. Basic expected format: one option per line and option name and value separated with `: `. For more complex options, the whole YAML format is supported.
+1. Select the Dataflow type. The list is automatically generated from the list of Symfony services with the
+   tags `coderhapsodie.dataflow.type`. If your dataflow type is not
+   present, [check the configuration](https://github.com/code-rhapsodie/dataflow-bundle#check-if-your-dataflowtype-is-ready)
+1. Type here the Dataflow options. Basic expected format: one option per line and option name and value separated
+   with `: `. For more complex options, the whole YAML format is supported.
 1. Choose the date and time of the first job.

 Finally, click on the "Create" button.

 # Rights

-If a non-administrator user needs read-only access to the dataflow interface, add the `Setup / Administrate` and `eZ Dataflow / View` policies in one of their roles.
+If a non-administrator user needs read-only access to the dataflow interface, add the `Setup / Administrate`
+and `eZ Dataflow / View` policies in one of their roles.

 # Issues and feature requests

@@ -394,7 +412,8 @@ Please report issues and request features at https://github.com/code-rhapsodie/e
 # Contributing

 Contributions are very welcome. Please see [CONTRIBUTING.md](CONTRIBUTING.md) for
-details. Thanks to [everyone who has contributed](https://github.com/code-rhapsodie/ezdataflow-bundle/graphs/contributors)
+details. Thanks
+to [everyone who has contributed](https://github.com/code-rhapsodie/ezdataflow-bundle/graphs/contributors)
 already.

 # License
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
    "name": "code-rhapsodie/ezdataflow-bundle",
-    "description": "Import/export bundle for eZ Platform based on Code-Rhapsodie Dataflow",
+    "description": "Import/export bundle for Ibexa based on Code-Rhapsodie Dataflow",
    "type": "symfony-bundle",
-    "keywords": ["dataflow", "import", "export", "data processing", "ez publish", "ez platform"],
+    "keywords": ["dataflow", "import", "export", "data processing", "ibexa"],
    "license": "MIT",
    "authors": [
        {
@@ -41,14 +41,15 @@
        }
    },
    "require": {
-        "php": "^7.3||^8.0",
-        "code-rhapsodie/dataflow-bundle": "^3.0",
-        "ezsystems/ezplatform-admin-ui": "^2.3",
-        "ezsystems/ezplatform-kernel": "^1.3"
+        "php": "^7.4||^8.0",
+        "code-rhapsodie/dataflow-bundle": "^3.0||^4.0",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "ibexa/admin-ui": "^4.0",
+        "ibexa/core": "^4.0"
    },
    "require-dev": {
-        "phpunit/phpunit": "^7||^8||^9",
-        "doctrine/dbal": "^2.0"
+        "doctrine/dbal": "^2.0|^3.0",
+        "phpunit/phpunit": "^7||^8||^9"
    },
    "minimum-stability": "dev",
    "prefer-stable": true,
@@ -60,7 +61,9 @@
    },
    "extra": {
        "branch-alias": {
-            "dev-master": "2.x-dev",
+            "dev-master": "4.x-dev",
+            "dev-v3.x": "3.x-dev",
+            "dev-v2.x": "2.x-dev",
            "dev-v1.x": "1.x-dev"
        }
    }
--- a/sonar-project.properties
+++ b/sonar-project.properties
@@ -0,0 +1,4 @@
+sonar.projectKey=code-rhapsodie_ezdataflow-bundle_AYvYuaBhWE9sbcQmD1vz
+
+sonar.sources=src
+sonar.tests=tests
--- a/src/CodeRhapsodieEzDataflowBundle.php
+++ b/src/CodeRhapsodieEzDataflowBundle.php
@@ -7,7 +7,7 @@ namespace CodeRhapsodie\EzDataflowBundle;
 use CodeRhapsodie\EzDataflowBundle\DependencyInjection\CodeRhapsodieEzDataflowExtension;
 use CodeRhapsodie\EzDataflowBundle\DependencyInjection\Compiler\FieldComparatorCompilerPass;
 use CodeRhapsodie\EzDataflowBundle\Security\PolicyProvider;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\EzPublishCoreExtension;
+use Ibexa\Bundle\Core\DependencyInjection\IbexaCoreExtension;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Bundle\Bundle;

@@ -26,8 +26,8 @@ class CodeRhapsodieEzDataflowBundle extends Bundle

        $container->addCompilerPass(new FieldComparatorCompilerPass());

-        /** @var EzPublishCoreExtension $eZExtension */
-        $eZExtension = $container->getExtension('ezpublish');
-        $eZExtension->addPolicyProvider(new PolicyProvider());
+        /** @var IbexaCoreExtension $ibexaExtension */
+        $ibexaExtension = $container->getExtension('ibexa');
+        $ibexaExtension->addPolicyProvider(new PolicyProvider());
    }
 }
--- a/src/Controller/DashboardController.php
+++ b/src/Controller/DashboardController.php
@@ -11,9 +11,9 @@ use CodeRhapsodie\EzDataflowBundle\Form\CreateScheduledType;
 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\EzPlatformAdminUiBundle\Controller\Controller;
-use Pagerfanta\Adapter\DoctrineDbalAdapter;
+use Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
+use Pagerfanta\Doctrine\DBAL\QueryAdapter;
 use Pagerfanta\Pagerfanta;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,9 +24,9 @@ use Symfony\Component\Routing\Annotation\Route;
 */
 class DashboardController extends Controller
 {
-    /** @var JobGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway */
    private $jobGateway;
-    /** @var ScheduledDataflowGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway */
    private $scheduledDataflowGateway;

    public function __construct(JobGateway $jobGateway, ScheduledDataflowGateway $scheduledDataflowGateway)
@@ -42,7 +42,7 @@ class DashboardController extends Controller
    {
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));

-        return $this->render('@ezdesign/ezdataflow/Dashboard/main.html.twig');
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/main.html.twig');
    }

    public function repeating(Request $request): Response
@@ -55,7 +55,7 @@ class DashboardController extends Controller
            'action' => $this->generateUrl('coderhapsodie.ezdataflow.workflow.create'),
        ]);

-        return $this->render('@ezdesign/ezdataflow/Dashboard/repeating.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/repeating.html.twig', [
            'pager' => $this->getPager($this->scheduledDataflowGateway->getListQueryForAdmin(), $request),
            'form' => $form->createView(),
        ]);
@@ -68,7 +68,7 @@ class DashboardController extends Controller
    {
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));

-        return $this->render('@ezdesign/ezdataflow/Dashboard/repeating.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/repeating.html.twig', [
            'pager' => $this->getPager($this->scheduledDataflowGateway->getListQueryForAdmin(), $request),
        ]);
    }
@@ -83,7 +83,7 @@ class DashboardController extends Controller
            'action' => $this->generateUrl('coderhapsodie.ezdataflow.job.create'),
        ]);

-        return $this->render('@ezdesign/ezdataflow/Dashboard/oneshot.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/oneshot.html.twig', [
            'pager' => $this->getPager($this->jobGateway->getOneshotListQueryForAdmin(), $request),
            'form' => $form->createView(),
        ]);
@@ -96,7 +96,7 @@ class DashboardController extends Controller
    {
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));

-        return $this->render('@ezdesign/ezdataflow/Dashboard/oneshot.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/oneshot.html.twig', [
            'pager' => $this->getPager($this->jobGateway->getOneshotListQueryForAdmin(), $request),
        ]);
    }
@@ -106,7 +106,7 @@ class DashboardController extends Controller
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);

-        return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/history.html.twig', [
            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
            'filter' => $filter,
        ]);
@@ -120,7 +120,7 @@ class DashboardController extends Controller
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));
        $filter = (int) $request->query->get('filter', JobGateway::FILTER_NONE);

-        return $this->render('@ezdesign/ezdataflow/Dashboard/history.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/history.html.twig', [
            'pager' => $this->getPager($this->jobGateway->getListQueryForAdmin($filter), $request),
            'filter' => $filter,
        ]);
@@ -133,7 +133,7 @@ class DashboardController extends Controller
    {
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));

-        return $this->render('@ezdesign/ezdataflow/Dashboard/schedule_history.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Dashboard/schedule_history.html.twig', [
            'id' => $id,
            'pager' => $this->getPager($this->jobGateway->getListQueryForScheduleAdmin($id), $request),
        ]);
@@ -141,7 +141,7 @@ class DashboardController extends Controller

    private function getPager(QueryBuilder $query, Request $request): Pagerfanta
    {
-        $pager = new Pagerfanta(new DoctrineDbalAdapter($query, function ($queryBuilder) {
+        $pager = new Pagerfanta(new QueryAdapter($query, function ($queryBuilder) {
            return $queryBuilder->select('COUNT(DISTINCT id) AS total_results')
                ->resetQueryPart('orderBy')
                ->setMaxResults(1);
--- a/src/Controller/JobController.php
+++ b/src/Controller/JobController.php
@@ -7,9 +7,9 @@ namespace CodeRhapsodie\EzDataflowBundle\Controller;
 use CodeRhapsodie\DataflowBundle\Entity\Job;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateOneshotType;
 use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
-use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -22,11 +22,11 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class JobController extends Controller
 {
-    /** @var JobGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway */
    private $jobGateway;
-    /** @var NotificationHandlerInterface */
+    /** @var \Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface */
    private $notificationHandler;
-    /** @var Symfony\Component\Translation\TranslatorInterface|Symfony\Contracts\Translation\TranslatorInterface */
+    /** @var \Symfony\Contracts\Translation\TranslatorInterface */
    private $translator;

    public function __construct(
@@ -46,7 +46,7 @@ class JobController extends Controller
    {
        $this->denyAccessUnlessGranted(new Attribute('ezdataflow', 'view'));

-        return $this->render('@ezdesign/ezdataflow/Item/details.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Item/details.html.twig', [
            'item' => $this->jobGateway->find($id),
        ]);
    }
@@ -62,7 +62,7 @@ class JobController extends Controller
            return preg_replace('~#\d+~', "\n$0", $line);
        }, $item->getExceptions());

-        return $this->render('@ezdesign/ezdataflow/Item/log.html.twig', [
+        return $this->render('@ibexadesign/ezdataflow/Item/log.html.twig', [
            'log' => $log,
        ]);
    }
@@ -78,7 +78,7 @@ class JobController extends Controller
        $form = $this->createForm(CreateOneshotType::class, $newOneshot);
        $form->handleRequest($request);
        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var Job $newOneshot */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\Job $newOneshot */
            $newOneshot = $form->getData();
            $newOneshot->setStatus(Job::STATUS_PENDING);

@@ -91,13 +91,13 @@ class JobController extends Controller
            }

            return new JsonResponse([
-                'redirect' => $this->generateUrl('coderhapsodie.ezdataflow.main', ['_fragment' => 'oneshot'],
+                'redirect' => $this->generateUrl('coderhapsodie.ezdataflow.main', ['_fragment' => 'ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-oneshot'],
                    UrlGeneratorInterface::ABSOLUTE_URL),
            ]);
        }

        return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                'form' => $form->createView(),
                'type_action' => 'new',
                'mode' => 'oneshot',
--- a/src/Controller/ScheduledDataflowController.php
+++ b/src/Controller/ScheduledDataflowController.php
@@ -7,11 +7,10 @@ namespace CodeRhapsodie\EzDataflowBundle\Controller;
 use CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow;
 use CodeRhapsodie\EzDataflowBundle\Form\CreateScheduledType;
 use CodeRhapsodie\EzDataflowBundle\Form\UpdateScheduledType;
-use CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway;
 use CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway;
-use eZ\Publish\Core\MVC\Symfony\Security\Authorization\Attribute;
-use EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface;
-use EzSystems\EzPlatformAdminUiBundle\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Controller\Controller;
+use Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface;
+use Ibexa\Core\MVC\Symfony\Security\Authorization\Attribute;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -23,22 +22,18 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 */
 class ScheduledDataflowController extends Controller
 {
-    /** @var JobGateway */
-    private $jobGateway;
-    /** @var NotificationHandlerInterface */
+    /** @var \Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface */
    private $notificationHandler;
-    /** @var ScheduledDataflowGateway */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway */
    private $scheduledDataflowGateway;
-    /** @var TranslatorInterface */
+    /** @var \Symfony\Contracts\Translation\TranslatorInterface */
    private $translator;

    public function __construct(
-        JobGateway $jobGateway,
        NotificationHandlerInterface $notificationHandler,
        ScheduledDataflowGateway $scheduledDataflowGateway,
        TranslatorInterface $translator
    ) {
-        $this->jobGateway = $jobGateway;
        $this->notificationHandler = $notificationHandler;
        $this->scheduledDataflowGateway = $scheduledDataflowGateway;
        $this->translator = $translator;
@@ -56,7 +51,7 @@ class ScheduledDataflowController extends Controller

        $form->handleRequest($request);
        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var ScheduledDataflow $newWorkflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $newWorkflow */
            $newWorkflow = $form->getData();
            try {
                $this->scheduledDataflowGateway->save($newWorkflow);
@@ -70,7 +65,7 @@ class ScheduledDataflowController extends Controller
        }

        return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                'form' => $form->createView(),
                'type_action' => 'new',
            ]),
@@ -87,14 +82,12 @@ class ScheduledDataflowController extends Controller
        try {
            $this->scheduledDataflowGateway->delete($id);
            $this->notificationHandler->success($this->translator->trans('coderhapsodie.ezdataflow.workflow.delete.success'));
-
-            return new JsonResponse(['code' => 200]);
        } catch (\Exception $e) {
            $this->notificationHandler->error($this->translator->trans('coderhapsodie.ezdataflow.workflow.delete.error',
                ['message' => $e->getMessage()]));
-
-            return new JsonResponse(['code' => $e->getCode()]);
        }
+
+        return $this->redirectToRoute('coderhapsodie.ezdataflow.main');
    }

    /**
@@ -108,7 +101,7 @@ class ScheduledDataflowController extends Controller
        $form->handleRequest($request);

        if ($form->isSubmitted() && $form->isValid()) {
-            /** @var ScheduledDataflow $editDataflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $editDataflow */
            $editDataflow = $form->getData();

            try {
@@ -123,7 +116,7 @@ class ScheduledDataflowController extends Controller
        }

        return new JsonResponse([
-            'form' => $this->renderView('@ezdesign/ezdataflow/parts/schedule_form.html.twig', [
+            'form' => $this->renderView('@ibexadesign/ezdataflow/parts/form_modal.html.twig', [
                'form' => $form->createView(),
                'type_action' => 'edit',
            ]),
@@ -145,7 +138,7 @@ class ScheduledDataflowController extends Controller
    private function changeDataflowStatus(int $id, bool $status)
    {
        try {
-            /** @var ScheduledDataflow $workflow */
+            /** @var \CodeRhapsodie\DataflowBundle\Entity\ScheduledDataflow $workflow */
            $workflow = $this->scheduledDataflowGateway->find($id);
            $workflow->setEnabled($status);
            $this->scheduledDataflowGateway->save($workflow);
--- a/src/Core/Content/ContentCreator.php
+++ b/src/Core/Content/ContentCreator.php
@@ -7,23 +7,23 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 use CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface;
 use CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Content;
-use eZ\Publish\API\Repository\Values\Content\LocationCreateStruct;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;

 class ContentCreator implements ContentCreatorInterface
 {
-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
    private $contentService;

-    /** @var ContentTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */
    private $contentTypeService;

-    /** @var ContentStructFieldFillerInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface */
    private $filler;

-    /** @var LocationMatcherInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface */
    private $matcher;

    public function __construct(ContentService $contentService, ContentTypeService $contentTypeService, ContentStructFieldFillerInterface $filler, LocationMatcherInterface $matcher)
@@ -35,12 +35,12 @@ class ContentCreator implements ContentCreatorInterface
    }

    /**
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
     */
    public function createFromStructure(ContentCreateStructure $structure): Content
    {
@@ -54,7 +54,7 @@ class ContentCreator implements ContentCreatorInterface
    }

    /**
-     * @return LocationCreateStruct[]
+     * @return \Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct[]
     */
    private function getLocationCreateStructs(array $locations): array
    {
--- a/src/Core/Content/ContentCreatorInterface.php
+++ b/src/Core/Content/ContentCreatorInterface.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Core\Content;

 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;

 interface ContentCreatorInterface
 {
--- a/src/Core/Content/ContentUpdater.php
+++ b/src/Core/Content/ContentUpdater.php
@@ -7,19 +7,19 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Content;
 use CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface;
 use CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;

 class ContentUpdater implements ContentUpdaterInterface
 {
-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
    private $contentService;

-    /** @var ContentTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentTypeService */
    private $contentTypeService;

-    /** @var ContentStructFieldFillerInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface */
    private $filler;

    public function __construct(ContentService $contentService, ContentTypeService $contentTypeService, ContentStructFieldFillerInterface $filler)
@@ -30,13 +30,13 @@ class ContentUpdater implements ContentUpdaterInterface
    }

    /**
-     * @throws NoMatchFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\BadStateException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentFieldValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\ContentValidationException
-     * @throws \eZ\Publish\API\Repository\Exceptions\InvalidArgumentException
-     * @throws \eZ\Publish\API\Repository\Exceptions\NotFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentFieldValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\ContentValidationException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
     */
    public function updateFromStructure(ContentUpdateStructure $structure): Content
    {
--- a/src/Core/Content/ContentUpdaterInterface.php
+++ b/src/Core/Content/ContentUpdaterInterface.php
@@ -5,7 +5,7 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Core\Content;

 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;

 interface ContentUpdaterInterface
 {
--- a/src/Core/Field/ContentStructFieldFiller.php
+++ b/src/Core/Field/ContentStructFieldFiller.php
@@ -6,9 +6,9 @@ namespace CodeRhapsodie\EzDataflowBundle\Core\Field;

 use CodeRhapsodie\EzDataflowBundle\Exception\UnknownFieldException;
 use CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException;
-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;

 class ContentStructFieldFiller implements ContentStructFieldFillerInterface
 {
@@ -26,8 +26,8 @@ class ContentStructFieldFiller implements ContentStructFieldFillerInterface
    /**
     * {@inheritdoc}
     *
-     * @throws UnknownFieldException
-     * @throws UnsupportedFieldTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnknownFieldException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException
     */
    public function fillFields(ContentType $contentType, ContentStruct $contentStruct, array $fieldHashes): void
    {
@@ -47,7 +47,7 @@ class ContentStructFieldFiller implements ContentStructFieldFillerInterface
    /**
     * @param mixed $hash
     *
-     * @throws UnsupportedFieldTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\UnsupportedFieldTypeException
     */
    private function createFieldValue(string $fieldTypeIdentifier, $hash): Value
    {
--- a/src/Core/Field/ContentStructFieldFillerInterface.php
+++ b/src/Core/Field/ContentStructFieldFillerInterface.php
@@ -4,8 +4,8 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;

-use eZ\Publish\API\Repository\Values\Content\ContentStruct;
-use eZ\Publish\API\Repository\Values\ContentType\ContentType;
+use Ibexa\Contracts\Core\Repository\Values\Content\ContentStruct;
+use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;

 interface ContentStructFieldFillerInterface
 {
--- a/src/Core/Field/DefaultFieldValueCreator.php
+++ b/src/Core/Field/DefaultFieldValueCreator.php
@@ -4,12 +4,12 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;

-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;

 class DefaultFieldValueCreator implements FieldValueCreatorInterface
 {
-    /** @var FieldTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\FieldTypeService */
    private $fieldTypeService;

    public function __construct(FieldTypeService $fieldTypeService)
--- a/src/Core/Field/FieldValueCreatorInterface.php
+++ b/src/Core/Field/FieldValueCreatorInterface.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\Field;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 interface FieldValueCreatorInterface
 {
--- a/src/Core/FieldComparator/AbstractFieldComparator.php
+++ b/src/Core/FieldComparator/AbstractFieldComparator.php
@@ -4,13 +4,13 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;

 abstract class AbstractFieldComparator implements FieldComparatorInterface
 {
-    /** @var FieldTypeService */
+    /** @var \Ibexa\Contracts\Core\Repository\FieldTypeService */
    private $fieldTypeService;

    public function __construct(FieldTypeService $fieldTypeService)
--- a/src/Core/FieldComparator/DelegatorFieldComparator.php
+++ b/src/Core/FieldComparator/DelegatorFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;

 class DelegatorFieldComparator implements FieldComparatorInterface
 {
--- a/src/Core/FieldComparator/FieldComparatorInterface.php
+++ b/src/Core/FieldComparator/FieldComparatorInterface.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;

 interface FieldComparatorInterface
 {
--- a/src/Core/FieldComparator/MapLocationFieldComparator.php
+++ b/src/Core/FieldComparator/MapLocationFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 class MapLocationFieldComparator extends AbstractFieldComparator
 {
--- a/src/Core/FieldComparator/MatrixFieldComparator.php
+++ b/src/Core/FieldComparator/MatrixFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 class MatrixFieldComparator extends AbstractFieldComparator
 {
--- a/src/Core/FieldComparator/NovaSEOMetasFieldComparator.php
+++ b/src/Core/FieldComparator/NovaSEOMetasFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 class NovaSEOMetasFieldComparator extends AbstractFieldComparator
 {
--- a/src/Core/FieldComparator/SimpleFieldComparator.php
+++ b/src/Core/FieldComparator/SimpleFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 class SimpleFieldComparator extends AbstractFieldComparator
 {
--- a/src/Core/FieldComparator/UrlFieldComparator.php
+++ b/src/Core/FieldComparator/UrlFieldComparator.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Core\FieldComparator;

-use eZ\Publish\Core\FieldType\Value;
+use Ibexa\Contracts\Core\FieldType\Value;

 class UrlFieldComparator extends AbstractFieldComparator
 {
--- a/src/DependencyInjection/Configuration.php
+++ b/src/DependencyInjection/Configuration.php
@@ -16,13 +16,7 @@ class Configuration implements ConfigurationInterface
    {
        $treeBuilder = new TreeBuilder('code_rhapsodie_ez_dataflow');

-        if (method_exists($treeBuilder, 'getRootNode')) {
-            $rootNode = $treeBuilder->getRootNode();
-        } else {
-            // BC for symfony/config < 4.2
-            $rootNode = $treeBuilder->root('code_rhapsodie_ez_dataflow');
-        }
-
+        $rootNode = $treeBuilder->getRootNode();
        $rootNode
            ->children()
                ->scalarNode('admin_login_or_id')
--- a/src/EventSubscriber/MenuSubscriber.php
+++ b/src/EventSubscriber/MenuSubscriber.php
@@ -4,9 +4,8 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\EventSubscriber;

-use EzSystems\EzPlatformAdminUi\Menu\Event\ConfigureMenuEvent;
-use EzSystems\EzPlatformAdminUi\Menu\MainMenuBuilder;
-use Knp\Menu\ItemInterface;
+use Ibexa\AdminUi\Menu\Event\ConfigureMenuEvent;
+use Ibexa\AdminUi\Menu\MainMenuBuilder;
 use Symfony\Component\EventDispatcher\EventSubscriberInterface;

 class MenuSubscriber implements EventSubscriberInterface
@@ -21,7 +20,7 @@ class MenuSubscriber implements EventSubscriberInterface

    public function onConfigureMenu(ConfigureMenuEvent $event)
    {
-        /** @var ItemInterface $menu */
+        /** @var \Knp\Menu\ItemInterface $menu */
        $menu = $event->getMenu();
        if (!isset($menu[MainMenuBuilder::ITEM_ADMIN])) {
            return;
--- a/src/Factory/ContentStructureFactory.php
+++ b/src/Factory/ContentStructureFactory.php
@@ -5,15 +5,14 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Factory;

 use CodeRhapsodie\EzDataflowBundle\Model\ContentCreateStructure;
-use CodeRhapsodie\EzDataflowBundle\Model\ContentStructure;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;

 final class ContentStructureFactory implements ContentStructureFactoryInterface
 {
    /**
-     * @var ContentService
+     * @var \Ibexa\Contracts\Core\Repository\ContentService
     */
    private $contentService;

@@ -29,10 +28,10 @@ final class ContentStructureFactory implements ContentStructureFactoryInterface
     * @param mixed $parentLocations
     * @param int   $mode            One of the constant ContentStructureFactoryInterface::MODE_*
     *
-     * @return false|ContentStructure
+     * @return false|\CodeRhapsodie\EzDataflowBundle\Model\ContentStructure
     *
     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
     */
    public function transform(array $data, string $remoteId, string $language, string $contentType, $parentLocations, int $mode = ContentStructureFactoryInterface::MODE_INSERT_OR_UPDATE)
    {
@@ -47,7 +46,7 @@ final class ContentStructureFactory implements ContentStructureFactoryInterface
            // The content doesn't exist yet, so it will be created.
        }

-        if ($mode === static::MODE_UPDATE_ONLY) {
+        if (self::MODE_UPDATE_ONLY === $mode) {
            return false;
        }

--- a/src/Filter/NotModifiedContentFilter.php
+++ b/src/Filter/NotModifiedContentFilter.php
@@ -6,7 +6,8 @@ namespace CodeRhapsodie\EzDataflowBundle\Filter;

 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Psr\Log\LoggerAwareTrait;

 /**
@@ -16,10 +17,10 @@ class NotModifiedContentFilter
 {
    use LoggerAwareTrait;

-    /** @var ContentService */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
    private $contentService;

-    /** @var FieldComparatorInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface */
    private $comparator;

    public function __construct(ContentService $contentService, FieldComparatorInterface $comparator)
@@ -37,7 +38,12 @@ class NotModifiedContentFilter
        if ($data->getId()) {
            $content = $this->contentService->loadContent($data->getId(), [$data->getLanguageCode()]);
        } else {
-            $content = $this->contentService->loadContentByRemoteId($data->getRemoteId(), [$data->getLanguageCode()]);
+            try {
+                $content = $this->contentService->loadContentByRemoteId($data->getRemoteId(), [$data->getLanguageCode()]);
+            } catch (NotFoundException $e) {
+                // New translation
+                return $data;
+            }
        }

        foreach ($data->getFields() as $identifier => $hash) {
--- a/src/Form/DataflowTypeChoiceType.php
+++ b/src/Form/DataflowTypeChoiceType.php
@@ -11,7 +11,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class DataflowTypeChoiceType extends AbstractType
 {
-    /** @var DataflowTypeRegistryInterface */
+    /** @var \CodeRhapsodie\DataflowBundle\Registry\DataflowTypeRegistryInterface */
    private $registry;

    public function __construct(DataflowTypeRegistryInterface $registry)
--- a/src/Form/UserTimezoneAwareDateTimeTransformer.php
+++ b/src/Form/UserTimezoneAwareDateTimeTransformer.php
@@ -4,13 +4,13 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Form;

-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\UserPreferenceService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\UserPreferenceService;
 use Symfony\Component\Form\DataTransformerInterface;

 class UserTimezoneAwareDateTimeTransformer implements DataTransformerInterface
 {
-    /** @var UserPreferenceService */
+    /** @var \Ibexa\Contracts\Core\Repository\UserPreferenceService */
    private $userPreferenceService;

    public function __construct(UserPreferenceService $userPreferenceService)
--- a/src/Form/UserTimezoneAwareDateTimeType.php
+++ b/src/Form/UserTimezoneAwareDateTimeType.php
@@ -4,14 +4,14 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Form;

-use eZ\Publish\API\Repository\UserPreferenceService;
+use Ibexa\Contracts\Core\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 */
+    /** @var \Ibexa\Contracts\Core\Repository\UserPreferenceService */
    private $userPreferenceService;

    public function __construct(UserPreferenceService $userPreferenceService)
--- a/src/Gateway/JobGateway.php
+++ b/src/Gateway/JobGateway.php
@@ -13,7 +13,7 @@ final class JobGateway
    public const FILTER_NONE = 0;
    public const FILTER_NON_EMPTY = 1;

-    /** @var JobRepository */
+    /** @var \CodeRhapsodie\DataflowBundle\Repository\JobRepository */
    private $jobRepository;

    public function __construct(JobRepository $jobRepository)
--- a/src/Gateway/ScheduledDataflowGateway.php
+++ b/src/Gateway/ScheduledDataflowGateway.php
@@ -10,7 +10,7 @@ use Doctrine\DBAL\Query\QueryBuilder;

 final class ScheduledDataflowGateway
 {
-    /** @var ScheduledDataflowRepository */
+    /** @var \CodeRhapsodie\DataflowBundle\Repository\ScheduledDataflowRepository */
    private $scheduledDataflowRepository;

    public function __construct(ScheduledDataflowRepository $scheduledDataflowRepository)
--- a/src/Matcher/LocationMatcher.php
+++ b/src/Matcher/LocationMatcher.php
@@ -5,13 +5,13 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Matcher;

 use CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException;
-use eZ\Publish\API\Repository\Exceptions\NotFoundException;
-use eZ\Publish\API\Repository\LocationService;
-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
+use Ibexa\Contracts\Core\Repository\LocationService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;

 class LocationMatcher implements LocationMatcherInterface
 {
-    /** @var LocationService */
+    /** @var \Ibexa\Contracts\Core\Repository\LocationService */
    private $locationService;

    public function __construct(LocationService $locationService)
@@ -22,8 +22,8 @@ class LocationMatcher implements LocationMatcherInterface
    /**
     * @param mixed $valueToMatch
     *
-     * @throws NoMatchFoundException
-     * @throws \eZ\Publish\API\Repository\Exceptions\UnauthorizedException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\NoMatchFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
     */
    public function matchLocation($valueToMatch): Location
    {
--- a/src/Matcher/LocationMatcherInterface.php
+++ b/src/Matcher/LocationMatcherInterface.php
@@ -4,7 +4,7 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Matcher;

-use eZ\Publish\API\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;

 interface LocationMatcherInterface
 {
--- a/src/Model/ContentCreateStructure.php
+++ b/src/Model/ContentCreateStructure.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 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;
+use Ibexa\Contracts\Core\Repository\Values\Content\Location;
+use Ibexa\Contracts\Core\Repository\Values\Content\LocationCreateStruct;

 class ContentCreateStructure extends ContentStructure
 {
@@ -28,7 +28,7 @@ class ContentCreateStructure extends ContentStructure
     *                         <li>a LocationCreateStruct object</li>
     *                         </ul>
     *
-     * @throws InvalidArgumentTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
     */
    public function __construct(string $contentTypeIdentifier, string $languageCode, array $locations, array $fields, ?string $remoteId = null)
    {
@@ -50,7 +50,7 @@ class ContentCreateStructure extends ContentStructure
    }

    /**
-     * @throws InvalidArgumentTypeException
+     * @throws \CodeRhapsodie\EzDataflowBundle\Exception\InvalidArgumentTypeException
     */
    private function setLocations(array $locations)
    {
--- a/src/Resources/config/services.yaml
+++ b/src/Resources/config/services.yaml
@@ -5,7 +5,7 @@ services:
    _defaults:
        public: false

-    coderhapsodie.dataflow.connection: "@ezpublish.persistence.connection"
+    coderhapsodie.dataflow.connection: "@ibexa.persistence.connection"

    CodeRhapsodie\EzDataflowBundle\Controller\DashboardController:
        public: true
@@ -23,8 +23,7 @@ services:
        tags:
            - { name: controller.service_arguments }
        arguments:
-            $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
+            $notificationHandler: '@Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface'
            $scheduledDataflowGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway'
            $translator: '@translator'
        calls:
@@ -37,7 +36,7 @@ services:
            - { name: controller.service_arguments }
        arguments:
            $jobGateway: '@CodeRhapsodie\EzDataflowBundle\Gateway\JobGateway'
-            $notificationHandler: '@EzSystems\EzPlatformAdminUi\Notification\NotificationHandlerInterface'
+            $notificationHandler: '@Ibexa\Contracts\AdminUi\Notification\NotificationHandlerInterface'
            $translator: '@translator'
        calls:
            - [ 'setContainer', [ '@service_container' ] ]
@@ -58,23 +57,23 @@ services:
    CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcherInterface: '@CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcher'
    CodeRhapsodie\EzDataflowBundle\UserSwitcher\UserSwitcher:
        arguments:
-            $permissionResolver: '@eZ\Publish\API\Repository\PermissionResolver'
-            $userService: '@eZ\Publish\API\Repository\UserService'
+            $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver'
+            $userService: '@Ibexa\Contracts\Core\Repository\UserService'
            $adminLoginOrId: '%coderhapsodie.ezdataflow.admin_login_or_id%'

    CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreatorInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreator'
    CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreator:
        arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
-            $contentTypeService: '@eZ\Publish\API\Repository\ContentTypeService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
+            $contentTypeService: '@Ibexa\Contracts\Core\Repository\ContentTypeService'
            $filler: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface'
            $matcher: '@CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface'

    CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdater'
    CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdater:
        arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
-            $contentTypeService: '@eZ\Publish\API\Repository\ContentTypeService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
+            $contentTypeService: '@Ibexa\Contracts\Core\Repository\ContentTypeService'
            $filler: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface'

    CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFillerInterface: '@CodeRhapsodie\EzDataflowBundle\Core\Field\ContentStructFieldFiller'
@@ -85,11 +84,11 @@ services:
    CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcherInterface: '@CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcher'
    CodeRhapsodie\EzDataflowBundle\Matcher\LocationMatcher:
        arguments:
-            $locationService: '@eZ\Publish\API\Repository\LocationService'
+            $locationService: '@Ibexa\Contracts\Core\Repository\LocationService'

    CodeRhapsodie\EzDataflowBundle\Core\Field\DefaultFieldValueCreator:
        arguments:
-            $fieldTypeService: '@eZ\Publish\API\Repository\FieldTypeService'
+            $fieldTypeService: '@Ibexa\Contracts\Core\Repository\FieldTypeService'
        tags:
            - { name: 'coderhapsodie.ezdataflow.field_value_creator', priority: -1000 }

@@ -100,7 +99,7 @@ services:

    CodeRhapsodie\EzDataflowBundle\Factory\ContentStructureFactory:
        arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'

    CodeRhapsodie\EzDataflowBundle\Form\DataflowTypeChoiceType:
        arguments:
@@ -118,7 +117,7 @@ services:

    CodeRhapsodie\EzDataflowBundle\Form\UserTimezoneAwareDateTimeType:
        arguments:
-            $userPreferenceService: '@eZ\Publish\API\Repository\UserPreferenceService'
+            $userPreferenceService: '@Ibexa\Contracts\Core\Repository\UserPreferenceService'
        tags: ['form.type']

    CodeRhapsodie\EzDataflowBundle\Gateway\ScheduledDataflowGateway:
@@ -130,33 +129,33 @@ services:
            $jobRepository: '@CodeRhapsodie\DataflowBundle\Repository\JobRepository'

    CodeRhapsodie\EzDataflowBundle\Tab\RepeatingTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
        public: false
        arguments:
            $httpKernelRuntime: '@twig.runtime.httpkernel'
        tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}

    CodeRhapsodie\EzDataflowBundle\Tab\OneshotTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
        public: false
        arguments:
            $httpKernelRuntime: '@twig.runtime.httpkernel'
        tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}

    CodeRhapsodie\EzDataflowBundle\Tab\HistoryTab:
-        parent: EzSystems\EzPlatformAdminUi\Tab\AbstractTab
+        parent: Ibexa\Contracts\AdminUi\Tab\AbstractTab
        public: false
        arguments:
            $httpKernelRuntime: '@twig.runtime.httpkernel'
        tags:
-            - {name: ezplatform.tab, group: coderhapsodie-ezdataflow}
+            - {name: ibexa.admin_ui.tab, group: coderhapsodie-ezdataflow}


    CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter:
        arguments:
-            $contentService: '@eZ\Publish\API\Repository\ContentService'
+            $contentService: '@Ibexa\Contracts\Core\Repository\ContentService'
            $comparator: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface'

    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface: '@CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator'
@@ -164,16 +163,15 @@ services:

    CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\AbstractFieldComparator:
        arguments:
-            $fieldTypeService: '@eZ\Publish\API\Repository\FieldTypeService'
+            $fieldTypeService: '@Ibexa\Contracts\Core\Repository\FieldTypeService'
        abstract: true

    _cr.admin_tabs.ezdataflow_group:
-        parent: EzSystems\EzPlatformAdminUi\Component\TabsComponent
+        parent: Ibexa\AdminUi\Component\TabsComponent
        autowire: true
        autoconfigure: false
        public: false
        arguments:
-            $template: '@@ezdesign/ezdataflow/parts/tab/ezdataflow.html.twig'
            $groupIdentifier: 'coderhapsodie-ezdataflow'
        tags:
-            - { name: ezplatform.admin_ui.component, group: 'coderhapsodie-ezdataflow' }
+            - { name: ibexa.admin_ui.component, group: 'coderhapsodie-ezdataflow' }
--- a/src/Resources/translations/ibexa_menu.en.yaml
+++ b/src/Resources/translations/ibexa_menu.en.yaml
@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow
--- a/src/Resources/translations/ibexa_menu.fr.yaml
+++ b/src/Resources/translations/ibexa_menu.fr.yaml
@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow
--- a/src/Resources/translations/menu.en.yaml
+++ b/src/Resources/translations/menu.en.yaml
@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow
--- a/src/Resources/translations/menu.fr.yaml
+++ b/src/Resources/translations/menu.fr.yaml
@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: eZ Dataflow
--- a/src/Resources/translations/messages.fr.yaml
+++ b/src/Resources/translations/messages.fr.yaml
@@ -21,10 +21,15 @@ coderhapsodie.ezdataflow.history.list.title: 'Liste des exécutions'
 coderhapsodie.ezdataflow.history.list.name: Nom
 coderhapsodie.ezdataflow.history.list.request: 'Demandé le'
 coderhapsodie.ezdataflow.history.list.count: 'Nombre d''objets'
+coderhapsodie.ezdataflow.history.list.error_count: 'Nombre d''erreurs'
 coderhapsodie.ezdataflow.history.list.start: 'Commencé le'
 coderhapsodie.ezdataflow.history.list.end: 'Terminé le'
 coderhapsodie.ezdataflow.history.list.view: 'Voir le détail'
 coderhapsodie.ezdataflow.history.list.status: État
+coderhapsodie.ezdataflow.history.filter.label: Filtrer les résultats
+coderhapsodie.ezdataflow.history.filter.none: Tous les résultats
+coderhapsodie.ezdataflow.history.filter.non_empty_only: Seulement non vides
+coderhapsodie.ezdataflow.history.filter.with_error_only: Seulement avec erreurs
 coderhapsodie.ezdataflow.job.status.pending: 'En attente'
 coderhapsodie.ezdataflow.job.status.running: 'En cours'
 coderhapsodie.ezdataflow.job.status.complete: Terminé
--- a/src/Resources/views/themes/admin/ezdataflow/Dashboard/history.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Dashboard/history.html.twig
@@ -1,35 +1,60 @@
-<h2>{{ 'coderhapsodie.ezdataflow.history.title'|trans }}</h2>
+{%- block content -%}
+    {% set choices = [
+        {
+            'value': 0,
+            'label': 'coderhapsodie.ezdataflow.history.filter.none'|trans,
+        },
+        {
+            'value': 1,
+            'label': 'coderhapsodie.ezdataflow.history.filter.non_empty_only'|trans,
+        },
+    ] %}

-<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>
+    {% set source %}
+        <select id="ezdataflow_history_filter" class="form-control ibexa-input">
+            {% for choice in choices %}
+                <option value="{{ choice.value }}">
+                    {{ choice.label }}
+                </option>
+            {% endfor %}
        </select>
-    </div>
-</div>
+    {% endset %}

-{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {
-    identifier: 'ezdataflow_history_results',
-    paginate_route: 'coderhapsodie.ezdataflow.history',
-    paginate_params: {'filter': filter}
-} %}
+    {% set actions %}
+        {{ include('@ibexadesign/ui/component/dropdown/dropdown.html.twig', {
+            source: source,
+            choices: choices,
+            value: filter,
+        }) }}
+    {% endset %}

-<script>
-    (function ($) {
-        $(document).ready(function ($) {
+    {{ include('@ibexadesign/ezdataflow/parts/tab/job_list.html.twig', {
+        identifier: 'ezdataflow_history_results',
+        paginate_route: 'coderhapsodie.ezdataflow.history',
+        paginate_params: {'filter': filter},
+        headline: 'coderhapsodie.ezdataflow.history.title'|trans,
+        actions: actions
+    }) }}
+
+    <script>
+        document.addEventListener('DOMContentLoaded', function () {
            // Manage ajax pagination
-            $('#ezdataflow_history_filter').change(function (e) {
+            document.getElementById('ezdataflow_history_filter').addEventListener('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');
-                    });
+                const loading = document.getElementById('loading_ezdataflow_history_results');
+                const results = document.getElementById('ezdataflow_history_results').querySelector('.ibexa-table');
+                loading.hidden = false;
+                results.innerHTML = '';
+                fetch('{{ path('coderhapsodie.ezdataflow.history') }}?filter=' + this.value)
+                    .then((r) => r.text())
+                    .then((content) => {
+                        const node = document.createElement('div');
+                        node.innerHTML = content;
+                        results.innerHTML = node.querySelector('#ezdataflow_history_results .ibexa-table').innerHTML;
+                        loading.hidden = true;
+                    })
+                ;
            });
-        });
-    })(jQuery);
-</script>
+        })
+    </script>
+{%- endblock -%}
--- a/src/Resources/views/themes/admin/ezdataflow/Dashboard/main.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Dashboard/main.html.twig
@@ -1,80 +1,85 @@
-{% extends ["@ezdesign/layout.html.twig", "@ezdesign/ui/layout.html.twig"] %}
+{% extends "@ibexadesign/ui/layout.html.twig" %}

-{% block body_class %}ez-has-full-width-footer{% endblock %}
+{% block body_class %}ibexa-ezdataflow{% endblock %}

 {% block breadcrumbs %}
-    {% include ['@ezdesign/parts/breadcrumbs.html.twig', '@ezdesign/ui/breadcrumbs.html.twig'] with { items: [
+    {% include '@ibexadesign/ui/breadcrumbs.html.twig' with { items: [
        { value: 'breadcrumb.admin'|trans(domain='messages')|desc('Admin') },
        { value: 'coderhapsodie.ezdataflow'|trans|desc('EzDataflow') }
    ]} %}
 {% endblock %}

-{% block page_title %}
-    {% include ['@ezdesign/parts/page_title.html.twig', '@ezdesign/ui/page_title.html.twig'] with {
+{% block header %}
+    {% include '@ibexadesign/ui/page_title.html.twig' with {
        title: 'coderhapsodie.ezdataflow'|trans|desc('EzDataflow'),
-        iconName: 'workflow'
    } %}
 {% endblock %}

 {% block content %}
-    {{ ez_render_component_group('coderhapsodie-ezdataflow', {'filter': app.request.query.get('filter', 0)}, '@ezdesign/ezdataflow/parts/tab/ezdataflow.html.twig') }}
+    {{ ibexa_render_component_group('coderhapsodie-ezdataflow', {'filter': app.request.query.get('filter', 0)}) }}

-    <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%">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title">{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}</h3>
-                    <button type="button" class="close" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body" id="modal_content-details"></div>
-            </div>
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history-details',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.history.job.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}
+
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history-log',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.workflow.log.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}
+
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-history',
+        attr_dialog: {'style': 'max-width: 75vw;'},
+        title: 'coderhapsodie.ezdataflow.workflow.history.title'|trans,
+    } %}
+        {% block body_content '' %}
+    {% endembed %}

    <script>
+        document.addEventListener('DOMContentLoaded', () => {
+            const bindModalLinks = (modalId, linkSelector) => {
+                const modal = document.getElementById(modalId);
+                const modalBody = modal.querySelector('.modal-body');
+                document.addEventListener('click', (e) => {
+                    const link = e.target.closest(linkSelector);
+                    if (link) {
+                        e.preventDefault();
+                        modalBody.innerHTML = '';
+                        fetch(link.href)
+                            .then((r) => r.text())
+                            .then((content) => {
+                                modalBody.innerHTML = content;
+                            })
+                        ;

-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--history-details').modal({keyboard: false, show: false});
-                $('.history-details-aware').delegate('.modal-history-details', 'click', function (e) {
-                    e.preventDefault();
-                    $('#modal_content-details').html('');
-                    $('#ez-modal--history-details h3').html("{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}");
-                    if ($(this).hasClass('modal-history-log')) {
-                        $('#ez-modal--history-details h3').html("{{ 'coderhapsodie.ezdataflow.workflow.log.title'|trans }}");
+                        return;
                    }
-                    $('#ez-modal--history-details').modal('show');
-                    $.ajax(this.href, {
-                        success: function (result) {
-                            $('#modal_content-details').html(result);
-                        }
-                    });
-                });
-                $('#ez-modal--history-details .close').click(function () {
-                    $('#ez-modal--history-details').modal('hide');
-                });
-                $(document).ready(function () {
-                    if (window.location.hash && window.location.hash === '#oneshot') {
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a').removeClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane').removeClass('active');
+                })
+            }
+            bindModalLinks('modal-history-details', '.modal-history-details');
+            bindModalLinks('modal-history-log', '.modal-history-log');
+            bindModalLinks('modal-history', '.modal-history');

-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a:eq(1)').addClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane:eq(1)').addClass('active');
-                    }
-                    if (window.location.hash && window.location.hash === '#history') {
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a').removeClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane').removeClass('active');
-
-                        $('#ez-tab-list-coderhapsodie-ezdataflow li a:eq(2)').addClass('active');
-                        $('#ez-tab-list-content-coderhapsodie-ezdataflow .tab-pane:eq(2)').addClass('active');
-                    }
-                });
-            });
-        })(jQuery);
+            const labels = document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-repeating')
+                .closest('ul').querySelectorAll('li.ibexa-tabs__tab');
+            const tabs = document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-repeating')
+                .closest('.tab-content').querySelectorAll('.tab-pane');
+        });
    </script>
 {% endblock %}
+
+{% block stylesheets %}
+    {{ parent() }}
+    <style>
+        .ezdataflow-date .ibexa-dropdown {
+            min-width: 0;
+        }
+    </style>
+{% endblock %}
--- a/src/Resources/views/themes/admin/ezdataflow/Dashboard/oneshot.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Dashboard/oneshot.html.twig
@@ -1,60 +1,58 @@
-<h2>{{ 'coderhapsodie.ezdataflow.oneshot.title'|trans }}</h2>
-
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.oneshot.list.title'|trans }}</div>
-    <div>
-        <button type="button" class="btn btn-primary btn-modal-launcher" data-toggle="modal"
-                data-target="#ez-modal--new-oneshot">
-            <svg class="ez-icon ez-icon--medium ez-icon--light ez-icon-create">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#create"></use>
+{%- block content -%}
+    {% set actions %}
+        <button
+            type="button"
+            class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
+            data-bs-toggle="modal"
+            data-bs-target="#modal-new-oneshot"
+        >
+            <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
            </svg>
+            <span class="ibexa-btn__label">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.submit'|trans|desc('Create') }}
+            </span>
        </button>
-    </div>
-</div>
+    {% endset %}

-{{ include('@ezdesign/ezdataflow/parts/tab/job_list.html.twig', {identifier: 'ezdataflow_oneshot_history', paginate_route: 'coderhapsodie.ezdataflow.oneshot'}) }}
+    {{ include('@ibexadesign/ezdataflow/parts/tab/job_list.html.twig', {
+        identifier: 'ezdataflow_oneshot_history',
+        paginate_route: 'coderhapsodie.ezdataflow.oneshot',
+        headline: 'coderhapsodie.ezdataflow.oneshot.title'|trans,
+        actions: actions,
+    }) }}

-{% if form is defined %}
-    {% form_theme form 'bootstrap_3_layout.html.twig' %}
-    <div class="modal fade ez-modal show" id="ez-modal--new-oneshot" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            {{ include('@ezdesign/ezdataflow/parts/schedule_form.html.twig', {mode: 'oneshot'}) }}
-        </div>
-    </div>
+    {% if form is defined %}
+        {{ include('@ibexadesign/ezdataflow/parts/form_modal.html.twig', {
+            'id': 'modal-new-oneshot',
+            'form': form,
+            'mode': 'oneshot'
+        }) }}
+    {% endif %}

    <script>
-
-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--new-oneshot').on('submit', 'form', function (e) {
-                    e.preventDefault();
-                    url = $(this).attr('action');
-                    data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
-                            if (result.redirect) {
-                                if (window.location.href === result.redirect) {
-                                    window.location.reload();
-                                }
-                                window.location = result.redirect;
-                                window.location.reload();
-                                return;
-                            }
-
-                            let obj = $(result.form).find('.modal-body');
-                            $('#ez-modal--new-oneshot .modal-body').html($(obj).html());
+        document.addEventListener('DOMContentLoaded', () => {
+            document.querySelector('#modal-new-oneshot form').addEventListener('submit', function (e) {
+                e.preventDefault();
+                url = this.getAttribute('action');
+                data = new FormData(this);
+                fetch(url, {
+                    'method': 'post',
+                    'body': data,
+                })
+                    .then((r) => r.json())
+                    .then((result) => {
+                        if (result.redirect) {
+                            window.location = result.redirect;
+                            window.location.reload();
+                            return;
                        }
-                    });
-                });
+                        const node = document.createElement('div');
+                        node.innerHTML = result.form;
+                        document.querySelector('#modal-new-oneshot .form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                    })
+                ;
            });
-        })(jQuery);
+        });
    </script>
-
-
-{% endif %}
+{%- endblock -%}
--- a/src/Resources/views/themes/admin/ezdataflow/Dashboard/repeating.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Dashboard/repeating.html.twig
@@ -1,185 +1,158 @@
-<h2>{{ 'coderhapsodie.ezdataflow.repeating.title'|trans }}</h2>
+{%- block content -%}

-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.workflow.list.title'|trans }}</div>
-    <div>
-        <button type="button" class="btn btn-primary btn-modal-launcher" data-toggle="modal"
-                data-target="#ez-modal--new-scheduled">
-            <svg class="ez-icon ez-icon--medium ez-icon--light ez-icon-create">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#create"></use>
-            </svg>
-        </button>
-    </div>
-</div>
+    {{ include('@ibexadesign/ezdataflow/parts/tab/schedule_list.html.twig', {
+        identifier: 'ezdataflow_schedule_results',
+        paginate_route: 'coderhapsodie.ezdataflow.repeating'
+    }) }}

-{{ include('@ezdesign/ezdataflow/parts/tab/schedule_list.html.twig', {identifier: 'ezdataflow_schedule_results', paginate_route: 'coderhapsodie.ezdataflow.repeating'}) }}
+    {{ include('@ibexadesign/ezdataflow/parts/form_modal.html.twig', {
+        'id': 'modal-new-scheduled',
+        'form': form
+    }) }}

-{% if form is defined %}
-    {% form_theme form 'bootstrap_3_layout.html.twig' %}
-    <div class="modal fade ez-modal show" id="ez-modal--new-scheduled" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            {{ include('@ezdesign/ezdataflow/parts/schedule_form.html.twig') }}
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-edit-scheduled',
+        title: 'coderhapsodie.ezdataflow.workflow.repeating.edit.title'|trans,
+    } %}
+        {% block body_content %}
+            <form action="" method="post">
+                <div class="form-fields"></div>
+                <button id="modal-edit-submit" type="submit" hidden />
+            </form>
+        {% endblock %}
+        {% block footer_content %}
+            <button type="button" class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#modal-edit-submit">
+                {{ 'coderhapsodie.ezdataflow.workflow.edit.submit'|trans }}
+            </button>
+            <button class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+            </button>
+        {% endblock %}
+    {% endembed %}

-    <!-- Modal -->
-    <div class="modal fade ez-modal ez-modal--delete-workflow show" id="ez-modal--delete-workflow" tabindex="-1"
-         role="dialog">
-        <div class="modal-dialog" role="document">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="../../ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body">
-                    <p class="font-weight-bold" id="delete-modal--workflow-name"></p>
-                    <p class="ez-modal-body__main">{{ 'coderhapsodie.ezdataflow.workflow.delete'|trans }}</p>
-                </div>
-                <div class="modal-footer">
-                    <button type="button" class="btn btn-dark"
-                            data-dismiss="modal">{{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}</button>
-                    <button type="button" class="btn btn-danger font-weight-bold"
-                            id="ez-modal--delete-workflow-confirm">{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}</button>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <div class="modal fade ez-modal show" id="ez-modal--history" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document" style="max-width: 80%">
-            <div class="modal-content">
-                <div class="modal-header">
-                    <h3 class="modal-title">{{ 'coderhapsodie.ezdataflow.workflow.history.title'|trans }}</h3>
-                    <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                            <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                 xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-                        </svg>
-                    </button>
-                </div>
-                <div class="modal-body history-details-aware" id="modal_content"></div>
-            </div>
-        </div>
-    </div>
-
-    <div class="modal fade ez-modal show" id="ez-modal--edit-scheduled" tabindex="-1" role="dialog" aria-modal="true">
-        <div class="modal-dialog" role="document">
-            <div id="schedule_edit"></div>
-        </div>
-    </div>
+    {% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+        id: 'modal-delete-confirm',
+        title: 'coderhapsodie.ezdataflow.workflow.delete'|trans,
+    } %}
+        {% block body_content %}
+            <form action="" method="post">
+                <div class="item-name"></div>
+                <button id="modal-delete-submit" type="submit" hidden />
+            </form>
+        {% endblock %}
+        {% block footer_content %}
+            <button type="button" class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#modal-delete-submit">
+                {{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}
+            </button>
+            <button class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+                {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+            </button>
+        {% endblock %}
+    {% endembed %}

    <script>
-        (function ($) {
-            $(document).ready(function ($) {
-                $('#ez-modal--history').modal({keyboard: false, show: false});
-                $('.modal-history').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#modal_content').html('');
-                        $('#ez-modal--history').modal('show');
-                        $.ajax(elem.href, {
-                            success: function (result) {
-                                $('#modal_content').html(result);
-                            }
-                        });
-                    });
-                });
-                $('#ez-modal--history .close').click(function () {
-                    $('#ez-modal--history').modal('hide');
-                });
+        document.addEventListener('DOMContentLoaded', () => {
+            // $('#ez-modal--edit-scheduled').modal({keyboard: true, show: false});
+            // $('.modal-edit').each(function (index, elem) {
+            //     $(elem).click(function (e) {
+            //         e.preventDefault();
+            //         $('#schedule_edit').html('');
+            //         $('#ez-modal--edit-scheduled').modal('show');
+            //         $.ajax(elem.href, {
+            //             success: function (result) {
+            //                 if (result.redirect) {
+            //                     if (window.location.href === result.redirect) {
+            //                         window.location.reload();
+            //                     }
+            //                     window.location = result.redirect;
+            //                     window.location.reload();
+            //                     return;
+            //                 }
+            //
+            //                 $('#schedule_edit').html(result.form);
+            //             }
+            //         });
+            //     });
+            // });
+            //
+            // $('#ez-modal--edit-scheduled').on('submit', 'form', function (e) {
+            //     e.preventDefault();
+            //     url = $(this).attr('action');
+            //     data = new FormData(this);
+            //     $.ajax({
+            //         'type': 'POST',
+            //         'url': url,
+            //         'data': data,
+            //         processData: false,
+            //         contentType: false,
+            //         success: function (result) {
+            //             if (result.redirect) {
+            //                 window.location = result.redirect;
+            //                 return;
+            //             }
+            //
+            //             $('#schedule_edit').html(result.form);
+            //         }
+            //     });
+            // });

-                $('#ez-modal--delete-workflow').modal({keyboard: true, show: false});
-                $('.modal-delete').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#delete-modal--workflow-name').html($(elem).data('name'));
-                        $('#ez-modal--delete-workflow').modal('show');
-                        $('#ez-modal--delete-workflow-confirm').data('target', $(elem).data('path'));
-                    });
-                });
-                $('#ez-modal--delete-workflow-confirm').click(function () {
-                    let target = $(this).data('target');
-                    if (target && target !== '') {
-                        $.ajax(target, {
-                            method: 'POST',
-                            complete: function () {
-                                $('#ez-modal--delete-workflow').modal('hide');
-                                window.location.reload();
-                            }
-                        });
-                    }
-                });
-
-                $('#ez-modal--edit-scheduled').modal({keyboard: true, show: false});
-                $('.modal-edit').each(function (index, elem) {
-                    $(elem).click(function (e) {
-                        e.preventDefault();
-                        $('#schedule_edit').html('');
-                        $('#ez-modal--edit-scheduled').modal('show');
-                        $.ajax(elem.href, {
-                            success: function (result) {
-                                if (result.redirect) {
-                                    if (window.location.href === result.redirect) {
-                                        window.location.reload();
-                                    }
-                                    window.location = result.redirect;
-                                    window.location.reload();
-                                    return;
-                                }
-
-                                $('#schedule_edit').html(result.form);
-                            }
-                        });
-                    });
-                });
-
-                $('#ez-modal--edit-scheduled').on('submit', 'form', function (e) {
+            const bindFormSubmit = (modalId) => {
+                document.querySelector('#'+modalId+' form').addEventListener('submit', function (e) {
                    e.preventDefault();
-                    url = $(this).attr('action');
+                    url = this.getAttribute('action');
                    data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
+                    fetch(url, {
+                        'method': 'post',
+                        'body': data,
+                    })
+                        .then((r) => r.json())
+                        .then((result) => {
                            if (result.redirect) {
                                window.location = result.redirect;
                                return;
                            }
-
-                            $('#schedule_edit').html(result.form);
-                        }
-                    });
+                            const node = document.createElement('div');
+                            node.innerHTML = result.form;
+                            document.querySelector('#'+modalId+' .form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                        })
+                    ;
                });
+            };
+            bindFormSubmit('modal-new-scheduled');
+            bindFormSubmit('modal-edit-scheduled');

-                $('#ez-modal--new-scheduled form').on('submit', function (e) {
+            const editModal = document.getElementById('modal-edit-scheduled')
+            document.addEventListener('click', (e) => {
+                const link = e.target.closest('.modal-edit');
+                if (link) {
                    e.preventDefault();
-                    url = $(this).attr('action');
-                    data = new FormData(this);
-                    $.ajax({
-                        'type': 'POST',
-                        'url': url,
-                        'data': data,
-                        processData: false,
-                        contentType: false,
-                        success: function (result) {
-                            if (result.redirect) {
-                                window.location = result.redirect;
-                                return;
-                            }
-                            let obj = $(result.form).find('.modal-body');
-                            $('#ez-modal--new-scheduled .modal-body').html($(obj).html());
-                        }
-                    });
-                });
-            });
-        })(jQuery);
+                    fetch(link.href, {
+                        'method': 'post'
+                    })
+                        .then((r) => r.json())
+                        .then((result) => {
+                            const node = document.createElement('div');
+                            node.innerHTML = result.form;
+                            editModal.querySelector('form').action = link.href;
+                            editModal.querySelector('.form-fields').innerHTML = node.querySelector('.form-fields').innerHTML;
+                        })
+                    ;
+
+                    return;
+                }
+            })
+
+            const deleteModal = document.getElementById('modal-delete-confirm')
+            document.addEventListener('click', (e) => {
+                const link = e.target.closest('.modal-delete');
+                if (link) {
+                    e.preventDefault();
+                    deleteModal.querySelector('.item-name').textContent = link.dataset.name;
+                    deleteModal.querySelector('form').action = link.href;
+
+                    return;
+                }
+            })
+        });
    </script>
-{% endif %}
+{%- endblock -%}
--- a/src/Resources/views/themes/admin/ezdataflow/Dashboard/schedule_history.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Dashboard/schedule_history.html.twig
@@ -1,7 +1,5 @@
-<h2>{{ 'coderhapsodie.ezdataflow.history.title'|trans }}</h2>
-
-<div class="ez-table-header">
-    <div class="ez-table-header__headline">{{ 'coderhapsodie.ezdataflow.history.list.title'|trans }}</div>
-</div>
-
-{% include '@ezdesign/ezdataflow/parts/tab/job_list.html.twig' with {identifier: 'ezdataflow_schedule_history_results', paginate_route: 'coderhapsodie.ezdataflow.history.workflow', paginate_params: {id: id}} %}
+{% include '@ibexadesign/ezdataflow/parts/tab/job_list.html.twig' with {
+    identifier: 'ezdataflow_schedule_history_results',
+    paginate_route: 'coderhapsodie.ezdataflow.history.workflow',
+    paginate_params: {id: id}
+} %}
--- a/src/Resources/views/themes/admin/ezdataflow/Item/details.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/Item/details.html.twig
@@ -1,4 +1,4 @@
-{% import '@ezdesign/ezdataflow/macros.twig' as macros %}
+{% import '@ibexadesign/ezdataflow/macros.twig' as macros %}

 {% block content %}
    <div class="container ez-main-container history-details-aware">
@@ -20,7 +20,7 @@
            </tr>
            <tr>
                <td>{{ 'coderhapsodie.ezdataflow.history.details.request'|trans }}</td>
-                <td>{{ date(item.requestedDate)|ez_short_datetime }}</td>
+                <td>{{ date(item.requestedDate)|ibexa_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(item.startTime)|ez_short_datetime : '—' }}</td>
+                <td>{{ item.startTime ? date(item.startTime)|ibexa_short_datetime : '—' }}</td>
            </tr>
            <tr>
                <td>{{ 'coderhapsodie.ezdataflow.history.details.end'|trans }}</td>
-                <td>{{ item.endTime ? date(item.endTime)|ez_short_datetime : '—' }}</td>
+                <td>{{ item.endTime ? date(item.endTime)|ibexa_short_datetime : '—' }}</td>
            </tr>
            <tr>
                <td>{{ 'coderhapsodie.ezdataflow.history.details.count'|trans }}</td>
--- a/src/Resources/views/themes/admin/ezdataflow/form_theme.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/form_theme.html.twig
@@ -0,0 +1,10 @@
+{% extends '@ibexadesign/ui/form_fields.html.twig' %}
+
+{%- block checkbox_widget -%}
+    {{ block('toggle_widget') }}
+{%- endblock -%}
+
+{% block datetime_widget -%}
+    {% set attr = attr|merge({class: (attr.class|default('') ~ ' ezdataflow-date')|trim}) %}
+    {{ parent() }}
+{%- endblock datetime_widget %}
--- a/src/Resources/views/themes/admin/ezdataflow/parts/form_modal.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/parts/form_modal.html.twig
@@ -0,0 +1,23 @@
+{% form_theme form '@ibexadesign/ezdataflow/form_theme.html.twig' %}
+
+{% embed '@ibexadesign/ui/component/modal/modal.html.twig' with {
+    id: id ?? '',
+    title: ('coderhapsodie.ezdataflow.workflow.'~(mode|default('repeating'))~'.'~(type_action|default('new'))~'.title')|trans,
+} %}
+    {% block body_content %}
+        {{ form_start(form) }}
+            <div class="form-fields">
+                {{ form_widget(form) }}
+            </div>
+            <button type="submit" hidden id="{{ id ~ '-submit' }}"></button>
+        {{ form_end(form) }}
+    {% endblock %}
+    {% block footer_content %}
+        <button class="btn ibexa-btn ibexa-btn--primary ibexa-btn--trigger" data-click="#{{ id ~ '-submit' }}">
+            {{ ('coderhapsodie.ezdataflow.workflow.'~(type_action|default('new'))~'.submit')|trans }}
+        </button>
+        <button type="button" class="btn ibexa-btn ibexa-btn--secondary" data-bs-dismiss="modal">
+            {{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}
+        </button>
+    {% endblock %}
+{% endembed %}
--- a/src/Resources/views/themes/admin/ezdataflow/parts/schedule_form.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/parts/schedule_form.html.twig
@@ -1,24 +0,0 @@
-{% form_theme form 'bootstrap_3_layout.html.twig' %}
-
-{{ form_start(form) }}
-<div class="modal-content">
-    <div class="modal-header">
-        <h3 class="modal-title">{{ ('coderhapsodie.ezdataflow.workflow.'~(mode|default('repeating'))~'.'~(type_action|default('new'))~'.title')|trans }}</h3>
-        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-            <svg class="ez-icon ez-icon--medium" aria-hidden="true">
-                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#discard"></use>
-            </svg>
-        </button>
-    </div>
-    <div class="modal-body">
-        {{ form_widget(form) }}
-    </div>
-    <div class="modal-footer justify-content-center">
-        <button type="button" class="btn btn-dark"
-                data-dismiss="modal">{{ 'coderhapsodie.ezdataflow.workflow.new.cancel'|trans }}</button>
-        <button type="submit"
-                class="btn btn-primary font-weight-bold">{{ ('coderhapsodie.ezdataflow.workflow.'~(type_action|default('new'))~'.submit')|trans }}</button>
-    </div>
-</div>
-{{ form_end(form) }}
--- a/src/Resources/views/themes/admin/ezdataflow/parts/tab/ezdataflow.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/parts/tab/ezdataflow.html.twig
@@ -1,27 +0,0 @@
-<div class="row ez-header pt-3">
-    <div class="container">
-        <ul class="nav nav-tabs ez-tabs nav-tabs-{{ group }} px-4" role="tablist" id="ez-tab-list-{{ group }}">
-            {% for tab in tabs %}
-                {% set id = group ~ '-' ~ tab.identifier %}
-                {% set active = loop.first %}
-                <li class="nav-item">
-                    <a class="nav-link{% if active %} active{% endif %}" id="ez-tab-label-{{ group }}"
-                       data-toggle="tab" href="#ez-tab-{{ id }}" role="tab" aria-controls="ez-tab-{{ id }}"
-                       aria-expanded="{{ active }}">{{ tab.name }}</a>
-                </li>
-            {% endfor %}
-        </ul>
-    </div>
-</div>
-<div class="tab-content container mt-4 px-5" id="ez-tab-list-content-{{ group }}">
-    {% for tab in tabs %}
-        {% set id = group ~ '-' ~ tab.identifier %}
-        {% set active = loop.first %}
-
-        <div class="tab-pane{% if active %} active{% endif %}" id="ez-tab-{{ id }}" role="tabpanel"
-             aria-labelledby="ez-tab-label-{{ group }}">
-            {{ tab.view|raw }}
-        </div>
-    {% endfor %}
-</div>
-
--- a/src/Resources/views/themes/admin/ezdataflow/parts/tab/job_list.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/parts/tab/job_list.html.twig
@@ -1,83 +1,117 @@
 {% set id = identifier|default('ezdataflow_history_results') %}

-{% import '@ezdesign/ezdataflow/macros.twig' as macros %}
+{% import '@ibexadesign/ezdataflow/macros.twig' as macros %}

-<div id="loading_{{ id }}" class="text-center d-none">
+<div id="loading_{{ id }}" class="text-center" hidden>
    <svg class="ez-icon ez-icon--extra-large">
        <use xmlns:xlink="http://www.w3.org/1999/xlink"
-             xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#spinner"></use>
+             xlink:href="{{ ibexa_icon_path('spinner') }}"></use>
    </svg>
 </div>

 <div id="{{ id }}" class="history-details-aware">
-    {% if pager.currentPageResults|length %}
-        <table class="table">
-            <thead>
-            <tr>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.name'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.request'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.count'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.start'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.end'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.history.list.status'|trans }}</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for job in pager.currentPageResults %}
-                <tr>
-                    <td>{{ job.label }}</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}) }}"
-                           class="btn btn-icon mx-2 modal-history-details"
-                           title="{{ 'coderhapsodie.ezdataflow.history.list.view'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#about-info"></use>
-                            </svg>
-                        </a>
-                        <a href="{{ path('coderhapsodie.ezdataflow.job.log', {id: job.id}) }}"
-                           class="btn btn-icon mx-2 modal-history-details modal-history-log"
-                           title="{{ 'coderhapsodie.ezdataflow.history.details.log'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#article"></use>
-                            </svg>
-                        </a>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p class="ez-table-no-content">{{ 'coderhapsodie.ezdataflow.history.list.empty'|trans }}</p>
-    {% endif %}
+
+    {% set body_rows = [] %}
+
+    {% for job in pager.currentPageResults %}
+        {% set body_row_cols = [] %}
+        {% set body_row_cols = body_row_cols|merge([
+            {content: job.label},
+            {content: date(job.requested_date)|ibexa_short_datetime},
+            {content: job.count|default('—')},
+            {content: job.start_time ? date(job.start_time)|ibexa_short_datetime : '—'},
+            {content: job.end_time ? date(job.end_time)|ibexa_short_datetime : '—'},
+            {content: macros.translateStatus(job.status)},
+        ]) %}
+
+        {% set col_raw %}
+            <a href="{{ path('coderhapsodie.ezdataflow.job.details', {id: job.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history-details"
+               title="{{ 'coderhapsodie.ezdataflow.history.list.view'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history-details"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--about-info">
+                    <use xlink:href="{{ ibexa_icon_path('about-info') }}"></use>
+                </svg>
+            </a>
+            <a href="{{ path('coderhapsodie.ezdataflow.job.log', {id: job.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history-log"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history-log"
+               title="{{ 'coderhapsodie.ezdataflow.history.details.log'|trans }}"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--article">
+                    <use xlink:href="{{ ibexa_icon_path('article') }}"></use>
+                </svg>
+            </a>
+        {% endset %}
+        {% set body_row_cols = body_row_cols|merge([{
+            has_action_btns: true,
+            content: col_raw,
+            raw: true,
+        }]) %}
+
+        {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
+    {% endfor %}
+
+    {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
+        headline: headline ?? null,
+        head_cols: [
+            { content: 'coderhapsodie.ezdataflow.history.list.name'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.request'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.count'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.start'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.end'|trans },
+            { content: 'coderhapsodie.ezdataflow.history.list.status'|trans },
+            { },
+        ],
+        body_rows,
+        empty_table_info_text: 'coderhapsodie.ezdataflow.history.list.empty'|trans,
+    } %}
+        {% block header %}
+            {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
+                {% block actions %}
+                    {{ actions ?? '' }}
+                {% endblock %}
+            {% endembed %}
+        {% endblock %}
+    {% endembed %}

    {% if pager.haveToPaginate %}
-        <div class="ez-pagination justify-content-center align-items-center ez-pagination__spacing">
-            {{ pagerfanta(pager, 'ez', {routeName: paginate_route, routeParams: paginate_params|default({})}) }}
-        </div>
+        {% include '@ibexadesign/ui/pagination.html.twig' with {
+            'pager': pager,
+            'paginaton_params': {
+                'routeName': paginate_route,
+                'routeParams': paginate_params|default({})
+            }
+        } %}
    {% endif %}
 </div>

 <script>
-    (function ($) {
-        $(document).ready(function ($) {
-            // Manage ajax pagination
-            $('#{{ id }}').delegate('.ez-pagination a', 'click', function (e) {
-                e.preventDefault();
-                $('#loading_{{ id }}').removeClass('d-none');
-                $('#{{ id }}')
-                    .html('')
-                    .load(this.href + ' #{{ id }}>*', null, function () {
-                        $('#loading_{{ id }}').addClass('d-none');
-                    });
-            });
+    document.addEventListener('DOMContentLoaded', () => {
+        // Manage ajax pagination
+        const display = document.getElementById('{{ id }}');
+        display.addEventListener('click', (e) => {
+            const link = e.target.closest('.ibexa-pagination a');
+            if (!link) {
+                return;
+            }
+
+            const loader = document.getElementById('loading_{{ id }}');
+            e.preventDefault();
+            loader.hidden = false;
+            display.innerHTML = '';
+            fetch(link.href)
+                .then((r) => r.text())
+                .then((content) => {
+                    const node = document.createElement('div');
+                    node.innerHTML = content;
+                    display.innerHTML = node.querySelector('#{{ id }}').innerHTML;
+                    loader.hidden = true;
+                })
+            ;
        });
-    })(jQuery);
+    });
 </script>
--- a/src/Resources/views/themes/admin/ezdataflow/parts/tab/schedule_list.html.twig
+++ b/src/Resources/views/themes/admin/ezdataflow/parts/tab/schedule_list.html.twig
@@ -1,106 +1,152 @@
 {% set id = identifier|default('ezdataflow_schedule_results') %}

-<div id="loading_{{ id }}" class="text-center d-none">
+<div id="loading_{{ id }}" class="text-center" hidden>
    <svg class="ez-icon ez-icon--extra-large">
        <use xmlns:xlink="http://www.w3.org/1999/xlink"
-             xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#spinner"></use>
+             xlink:href="{{ ibexa_icon_path('spinner') }}"></use>
    </svg>
 </div>

 <div id="{{ id }}" class="history-details-aware">
-    {% if pager.currentPageResults|length %}
-        <table class="table">
-            <thead>
-            <tr>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.name'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.frequency'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.next_execution'|trans }}</th>
-                <th>{{ 'coderhapsodie.ezdataflow.workflow.list.enabled'|trans }}</th>
-                <th></th>
-            </tr>
-            </thead>
-            <tbody>
-            {% for item in pager.currentPageResults %}
-                <tr>
-                    <td>{{ item.label }}</td>
-                    <td>{{ item.frequency }}</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}) }}"
-                           class="btn btn-icon mx-2 modal-history"
-                           title="{{ 'coderhapsodie.ezdataflow.workflow.list.history'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#history"></use>
-                            </svg>
-                        </a>
-                        <a href="{{ path('coderhapsodie.ezdataflow.workflow.edit', {id: item.id}) }}" type="button"
-                           class="btn btn-icon mx-2 modal-edit"
-                           title="{{ 'coderhapsodie.ezdataflow.workflow.list.edit'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium ez-icon-edit">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#edit"></use>
-                            </svg>
-                        </a>
-                        {% if item.enabled %}
-                            <a href="{{ path('coderhapsodie.ezdataflow.workflow.disable', {id: item.id}) }}"
-                               class="btn btn-icon mx-2"
-                               title="{{ 'coderhapsodie.ezdataflow.workflow.list.disable'|trans }}">
-                                <svg class="ez-icon ez-icon--small-medium" style="fill: #f7d000;">
-                                    <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                         xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#logout"></use>
-                                </svg>
-                            </a>
-                        {% else %}
-                            <a href="{{ path('coderhapsodie.ezdataflow.workflow.enable', {id: item.id}) }}"
-                               class="btn btn-icon mx-2"
-                               title="{{ 'coderhapsodie.ezdataflow.workflow.list.enable'|trans }}">
-                                <svg class="ez-icon ez-icon--small-medium" style="fill: #00825c;">
-                                    <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                         xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#approved"></use>
-                                </svg>
-                            </a>
-                        {% endif %}
-                        <button type="button" class="btn btn-icon mx-2 ez-btn--content-trash modal-delete"
-                                data-name="{{ item.label }}"
-                                data-path="{{ path('coderhapsodie.ezdataflow.workflow.delete', {id: item.id}) }}"
-                                title="{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}">
-                            <svg class="ez-icon ez-icon--small-medium ez-icon-trash">
-                                <use xmlns:xlink="http://www.w3.org/1999/xlink"
-                                     xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#trash"></use>
-                            </svg>
-                        </button>
-                    </td>
-                </tr>
-            {% endfor %}
-            </tbody>
-        </table>
-    {% else %}
-        <p class="ez-table-no-content">{{ 'coderhapsodie.ezdataflow.workflow.list.empty'|trans }}</p>
-    {% endif %}
+    {% set body_rows = [] %}
+
+    {% for item in pager.currentPageResults %}
+        {% set body_row_cols = [] %}
+        {% set body_row_cols = body_row_cols|merge([
+            {content: item.label},
+            {content: item.frequency},
+            {content: date(item.next)|ibexa_short_datetime},
+            {content: ('coderhapsodie.ezdataflow.' ~ (item.enabled ? 'yes' : 'no'))|trans},
+        ]) %}
+
+        {% set col_raw %}
+            <a href="{{ path('coderhapsodie.ezdataflow.history.workflow', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-history"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.history'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-history"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--history">
+                    <use xlink:href="{{ ibexa_icon_path('history') }}"></use>
+                </svg>
+            </a>
+            <a href="{{ path('coderhapsodie.ezdataflow.workflow.edit', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-edit"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.edit'|trans }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-edit-scheduled"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--edit">
+                    <use xlink:href="{{ ibexa_icon_path('edit') }}"></use>
+                </svg>
+            </a>
+            {% if item.enabled %}
+                <a href="{{ path('coderhapsodie.ezdataflow.workflow.disable', {id: item.id}) }}"
+                   class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
+                   title="{{ 'coderhapsodie.ezdataflow.workflow.list.disable'|trans }}"
+                >
+                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--logout" style="fill: #f7d000;">
+                        <use xlink:href="{{ ibexa_icon_path('logout') }}"></use>
+                    </svg>
+                </a>
+            {% else %}
+                <a href="{{ path('coderhapsodie.ezdataflow.workflow.enable', {id: item.id}) }}"
+                   class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text"
+                   title="{{ 'coderhapsodie.ezdataflow.workflow.list.enable'|trans }}"
+                >
+                    <svg class="ibexa-icon ibexa-icon--small ibexa-icon--logout" style="fill: #00825c;">
+                        <use xlink:href="{{ ibexa_icon_path('approved') }}"></use>
+                    </svg>
+                </a>
+            {% endif %}
+            <a href="{{ path('coderhapsodie.ezdataflow.workflow.delete', {id: item.id}) }}"
+               class="btn ibexa-btn ibexa-btn--ghost ibexa-btn--no-text modal-delete"
+               title="{{ 'coderhapsodie.ezdataflow.workflow.list.delete'|trans }}"
+               data-name="{{ item.label }}"
+               data-bs-toggle="modal"
+               data-bs-target="#modal-delete-confirm"
+            >
+                <svg class="ibexa-icon ibexa-icon--small ibexa-icon--trash">
+                    <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
+                </svg>
+            </a>
+        {% endset %}
+        {% set body_row_cols = body_row_cols|merge([{
+            has_action_btns: true,
+            content: col_raw,
+            raw: true,
+        }]) %}
+
+        {% set body_rows = body_rows|merge([{ cols: body_row_cols }]) %}
+    {% endfor %}
+
+    {% embed '@ibexadesign/ui/component/table/table.html.twig' with {
+        headline: 'coderhapsodie.ezdataflow.workflow.list.title'|trans,
+        head_cols: [
+            { content: 'coderhapsodie.ezdataflow.workflow.list.name'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.frequency'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.next_execution'|trans },
+            { content: 'coderhapsodie.ezdataflow.workflow.list.enabled'|trans },
+            { },
+        ],
+        body_rows,
+        empty_table_info_text: 'coderhapsodie.ezdataflow.workflow.list.empty'|trans,
+    } %}
+        {% block header %}
+            {% embed '@ibexadesign/ui/component/table/table_header.html.twig' %}
+                {% block actions %}
+                    <button
+                        type="button"
+                        class="btn ibexa-btn ibexa-btn--tertiary ibexa-btn--small"
+                        data-bs-toggle="modal"
+                        data-bs-target="#modal-new-scheduled"
+                    >
+                        <svg class="ibexa-icon ibexa-icon--small ibexa-icon--create">
+                            <use xlink:href="{{ ibexa_icon_path('create') }}"></use>
+                        </svg>
+                        <span class="ibexa-btn__label">
+                            {{ 'coderhapsodie.ezdataflow.workflow.new.submit'|trans|desc('Create') }}
+                        </span>
+                    </button>
+                {% endblock %}
+            {% endembed %}
+        {% endblock %}
+    {% endembed %}

    {% if pager.haveToPaginate %}
-        <div class="ez-pagination justify-content-center align-items-center ez-pagination__spacing">
-            {{ pagerfanta(pager, 'ez', {routeName: paginate_route, routeParams: paginate_params|default({})}) }}
-        </div>
+        {% include '@ibexadesign/ui/pagination.html.twig' with {
+            'pager': pager,
+            'paginaton_params': {
+                'routeName': paginate_route,
+                'routeParams': paginate_params|default({})
+            }
+        } %}
    {% endif %}
 </div>

 <script>
+    document.addEventListener('DOMContentLoaded', () => {
+        // Manage ajax pagination
+        const display = document.getElementById('{{ id }}');
+        display.addEventListener('click', (e) => {
+            const link = e.target.closest('.ibexa-pagination a');
+            if (!link) {
+                return;
+            }

-    (function ($) {
-        $(document).ready(function ($) {
-            // Manage ajax pagination
-            $('#{{ id }}').delegate('.ez-pagination a', 'click', function (e) {
-                e.preventDefault();
-                $('#loading_{{ id }}').removeClass('d-none');
-                $('#{{ id }}')
-                    .html('')
-                    .load(this.href + ' #{{ id }}>*', null, function () {
-                        $('#loading_{{ id }}').addClass('d-none');
-                    });
-            });
+            const loader = document.getElementById('loading_{{ id }}');
+            e.preventDefault();
+            loader.hidden = false;
+            display.innerHTML = '';
+            fetch(link.href)
+                .then((r) => r.text())
+                .then((content) => {
+                    const node = document.createElement('div');
+                    node.innerHTML = content;
+                    display.innerHTML = node.querySelector('#{{ id }}').innerHTML;
+                    loader.hidden = true;
+                })
+            ;
        });
-    })(jQuery);
+    });
 </script>
--- a/src/Security/PolicyProvider.php
+++ b/src/Security/PolicyProvider.php
@@ -4,8 +4,8 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\Security;

-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
-use eZ\Bundle\EzPublishCoreBundle\DependencyInjection\Security\PolicyProvider\YamlPolicyProvider;
+use Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\PolicyProviderInterface;
+use Ibexa\Bundle\Core\DependencyInjection\Security\PolicyProvider\YamlPolicyProvider;

 class PolicyProvider extends YamlPolicyProvider implements PolicyProviderInterface
 {
--- a/src/Tab/HistoryTab.php
+++ b/src/Tab/HistoryTab.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;

 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;

 class HistoryTab extends AbstractControllerBasedTab implements OrderedTabInterface
--- a/src/Tab/OneshotTab.php
+++ b/src/Tab/OneshotTab.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;

 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;

 class OneshotTab extends AbstractControllerBasedTab implements OrderedTabInterface
--- a/src/Tab/RepeatingTab.php
+++ b/src/Tab/RepeatingTab.php
@@ -5,8 +5,8 @@ declare(strict_types=1);
 namespace CodeRhapsodie\EzDataflowBundle\Tab;

 use CodeRhapsodie\EzDataflowBundle\Controller\DashboardController;
-use EzSystems\EzPlatformAdminUi\Tab\AbstractControllerBasedTab;
-use EzSystems\EzPlatformAdminUi\Tab\OrderedTabInterface;
+use Ibexa\Contracts\AdminUi\Tab\AbstractControllerBasedTab;
+use Ibexa\Contracts\AdminUi\Tab\OrderedTabInterface;
 use Symfony\Component\HttpKernel\Controller\ControllerReference;

 class RepeatingTab extends AbstractControllerBasedTab implements OrderedTabInterface
--- a/src/UserSwitcher/UserSwitcher.php
+++ b/src/UserSwitcher/UserSwitcher.php
@@ -4,22 +4,21 @@ declare(strict_types=1);

 namespace CodeRhapsodie\EzDataflowBundle\UserSwitcher;

-use eZ\Publish\API\Repository\PermissionResolver;
-use eZ\Publish\API\Repository\UserService;
-use eZ\Publish\API\Repository\Values\User\UserReference;
+use Ibexa\Contracts\Core\Repository\PermissionResolver;
+use Ibexa\Contracts\Core\Repository\UserService;

 class UserSwitcher implements UserSwitcherInterface
 {
-    /** @var PermissionResolver */
+    /** @var \Ibexa\Contracts\Core\Repository\PermissionResolver */
    private $permissionResolver;

-    /** @var UserService */
+    /** @var \Ibexa\Contracts\Core\Repository\UserService */
    private $userService;

    /** @var string|int */
    private $adminLoginOrId;

-    /** @var UserReference[] */
+    /** @var \Ibexa\Contracts\Core\Repository\Values\User\UserReference[] */
    private $userStack;

    public function __construct(PermissionResolver $permissionResolver, UserService $userService, $adminLoginOrId)
--- a/src/Writer/ContentWriter.php
+++ b/src/Writer/ContentWriter.php
@@ -16,10 +16,10 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
 {
    use LoggerAwareTrait;

-    /** @var ContentCreatorInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Content\ContentCreatorInterface */
    private $creator;

-    /** @var ContentUpdaterInterface */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\Content\ContentUpdaterInterface */
    private $updater;

    public function __construct(ContentCreatorInterface $creator, ContentUpdaterInterface $updater)
@@ -29,7 +29,7 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
    }

    /**
-     * @param ContentStructure $item
+     * @param \CodeRhapsodie\EzDataflowBundle\Model\ContentStructure $item
     */
    public function write($item)
    {
@@ -44,14 +44,14 @@ class ContentWriter extends RepositoryWriter implements DelegateWriterInterface
                'content_type' => $item->getContentTypeIdentifier(),
                'content_location' => $item->getLocations(),
            ]);
+            $this->creator->createFromStructure($item);

-            return $this->creator->createFromStructure($item);
+            return;
        }

        if ($item instanceof ContentUpdateStructure) {
            $this->log('info', 'Update content', ['id' => $item->getId(), 'remote_id' => $item->getRemoteId()]);
-
-            return $this->updater->updateFromStructure($item);
+            $this->updater->updateFromStructure($item);
        }
    }

--- a/tests/Core/FieldComparator/DelegatorFieldComparatorTest.php
+++ b/tests/Core/FieldComparator/DelegatorFieldComparatorTest.php
@@ -4,12 +4,12 @@ namespace CodeRhapsodie\EzDataflowBundle\Tests\Core\FieldComparator;

 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator;
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
-use eZ\Publish\API\Repository\Values\Content\Field;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
 use PHPUnit\Framework\TestCase;

 class DelegatorFieldComparatorTest extends TestCase
 {
-    /** @var DelegatorFieldComparator */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\DelegatorFieldComparator */
    private $delegatorFieldComparator;

    protected function setUp(): void
--- a/tests/Filter/NotModifiedContentFilterTest.php
+++ b/tests/Filter/NotModifiedContentFilterTest.php
@@ -7,21 +7,21 @@ namespace CodeRhapsodie\EzDataflowBundle\Tests\Filter;
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
-use eZ\Publish\API\Repository\ContentService;
-use eZ\Publish\API\Repository\Values\Content\Field;
-use eZ\Publish\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Values\Content\Field;
+use Ibexa\Core\Repository\Values\Content\Content;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;

 class NotModifiedContentFilterTest extends TestCase
 {
-    /** @var ContentService|MockObject */
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService|\PHPUnit\Framework\MockObject\MockObject */
    private $contentServiceMock;

-    /** @var FieldComparatorInterface|MockObject */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface|\PHPUnit\Framework\MockObject\MockObject */
    private $comparatorMock;

-    /** @var NotModifiedContentFilter */
+    /** @var \CodeRhapsodie\EzDataflowBundle\Filter\NotModifiedContentFilter */
    private $notModifiedContentFilter;

    protected function setUp(): void
Author	SHA1	Message	Date
Jérémy J	411fd42471	Updated CHANGELOG	2024-03-15 11:32:03 +01:00
Jérémy J	0b295ba5d7	Fix redirection after adding a new oneshot job	2024-03-15 11:28:11 +01:00
Jérémy J	1be233b29d	Fix main menu label	2024-03-15 11:27:52 +01:00
Jérémy J	675ea28328	Fix NotModifiedContentFilter when creating new translation	2024-02-05 15:52:11 +01:00
Olivier PORTIER	877d537d74	Create semicolons-kudos.yaml for receiving Kudos (#46 )	2023-12-27 18:53:20 +01:00
jbcr	a71d473c39	add sonar config	2023-11-16 16:53:31 +01:00
jbcr	bd47a8d3c2	update changelog and maintened version (#45 )	2023-11-02 10:41:46 +01:00
jeremycr	8ab924cf83	Allow Dataflow 4 (#44 )	2023-07-27 09:56:48 +02:00
jeremycr	d0367d76e1	Ibexa 4 support (#42 )	2023-07-21 14:29:09 +02:00