add informations, project renamed (#47)

* add informations, project renamed

CHANGELOG.md

@@ -1,3 +1,12 @@
+# 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

README.md

@@ -1,9 +1,11 @@
-# Code Rhapsodie eZ Dataflow Bundle
+# Code Rhapsodie Ibexa Dataflow Bundle
 
-EzDataflowBundle is a bundle
+### ⚠️ This project has been relocated to [ibexa-dataflow-bundle](https://github.com/code-rhapsodie/ibexa-dataflow-bundle).  All future development and issues will be tracked there.
+
+Ibexa DataflowBundle 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.
+Ibexa Dataflow 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).
@@ -11,7 +13,7 @@ EzDataflow bundle is intended to manage content imports from external data sourc
 > 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                       |
+| Ibexa Dataflow Version | Ibexa Content Version | Status                       |
 |---------------------|-----------------------|------------------------------|
 | 4.x                 | 4.x                   | :white_check_mark: Maintened |
 | 3.x                 | 3.x                   | :white_check_mark: Maintened |
@@ -305,18 +307,18 @@ App\FieldComparator\MyFieldComparator:
 
 # Admin UI
 
-## Access to the eZ Dataflow UI
+## Access to the Ibexa Dataflow UI
 
-You can access the eZ Dataflow administration UI from your Ibexa admin back-office.
+You can access the Ibexa Dataflow administration UI from your Ibexa admin back-office.
 
 ![Admin menu](src/Resources/doc/ez_dataflow_admin_menu.jpg)
 
 1. Click to "Admin"
-1. Click to "eZ Dataflow"
+1. Click to "Ibexa Dataflow"
 
 ## Scheduled dataflow list
 
-When you access to the eZ Dataflow administration UI, you going here:
+When you access to the Ibexa Dataflow administration UI, you going here:
 
 ![Scheduled dataflow list](src/Resources/doc/scheduled_list.jpg)
 
@@ -332,7 +334,7 @@ When you access to the eZ Dataflow administration UI, you going here:
 
 ## Add a new schedule
 
-Go to the eZ Dataflow admin, and click on the "+" orange button.
+Go to the Ibexa Dataflow admin, and click on the "+" orange button.
 
 In the new popin, fill in the fields:
 
@@ -353,7 +355,7 @@ 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
+When you click on the "History" tab in the Ibexa Dataflow admin UI, the job history for all Dataflow configured and
 executed is displayed.
 
 ![History list](src/Resources/doc/history_list.jpg)
@@ -370,7 +372,7 @@ Details of one scheduled job:
 
 If you don't want to run a Dataflow periodically, you can add a single execution at the time and date that you want.
 
-Go to the eZ Dataflow admin UI and click on the "Oneshot" tab.
+Go to the Ibexa Dataflow admin UI and click on the "Oneshot" tab.
 
 ![Oneshot list](src/Resources/doc/oneshot_list.jpg)
 
@@ -386,7 +388,7 @@ Here the job has fail.
 
 ## Add a one-shot job
 
-Go to the eZ Dataflow admin UI and click on the "Oneshot" tab. Click on the "+" orange button to open the adding popin.
+Go to the Ibexa Dataflow admin UI and click on the "Oneshot" tab. Click on the "+" orange button to open the adding popin.
 
 ![The add one-shot popin](src/Resources/doc/one_shot_job.jpg)
 
@@ -403,7 +405,7 @@ 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.
+and `Ibexa Dataflow / View` policies in one of their roles.
 
 # Issues and feature requests
 

composer.json

@@ -59,6 +59,9 @@
             "php-http/discovery": true
         }
     },
+    "suggest": {
+        "code-rhapsodie/ibexa-dataflow-bundle": "Use the new rebranded package."
+    },
     "extra": {
         "branch-alias": {
             "dev-master": "4.x-dev",

src/Controller/JobController.php

@@ -91,7 +91,7 @@ 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),
             ]);
         }

src/Filter/NotModifiedContentFilter.php

@@ -7,6 +7,7 @@ namespace CodeRhapsodie\EzDataflowBundle\Filter;
 use CodeRhapsodie\EzDataflowBundle\Core\FieldComparator\FieldComparatorInterface;
 use CodeRhapsodie\EzDataflowBundle\Model\ContentUpdateStructure;
 use Ibexa\Contracts\Core\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException;
 use Psr\Log\LoggerAwareTrait;
 
 /**
@@ -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) {

src/Resources/translations/forms.en.yaml

@@ -1,4 +1,4 @@
-role.policy.ezdataflow: eZ Dataflow
-role.policy.ezdataflow.all_functions: eZ Dataflow / All functions
-role.policy.ezdataflow.view: eZ Dataflow / View
-role.policy.ezdataflow.edit: eZ Dataflow / Edit
+role.policy.ezdataflow: Ibexa Dataflow
+role.policy.ezdataflow.all_functions: Ibexa Dataflow / All functions
+role.policy.ezdataflow.view: Ibexa Dataflow / View
+role.policy.ezdataflow.edit: Ibexa Dataflow / Edit

src/Resources/translations/forms.fr.yaml

@@ -1,4 +1,4 @@
-role.policy.ezdataflow: eZ Dataflow
-role.policy.ezdataflow.all_functions: eZ Dataflow / Toutes les fonctions
-role.policy.ezdataflow.view: eZ Dataflow / Consultation
-role.policy.ezdataflow.edit: eZ Dataflow / Modification
+role.policy.ezdataflow: Ibexa Dataflow
+role.policy.ezdataflow.all_functions: Ibexa Dataflow / Toutes les fonctions
+role.policy.ezdataflow.view: Ibexa Dataflow / Consultation
+role.policy.ezdataflow.edit: Ibexa Dataflow / Modification

src/Resources/translations/ibexa_menu.en.yaml

@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: Ibexa Dataflow

src/Resources/translations/ibexa_menu.fr.yaml

@@ -0,0 +1 @@
+coderhapsodie.ezdataflow: Ibexa Dataflow

src/Resources/translations/menu.en.yaml

@@ -1 +1 @@
-coderhapsodie.ezdataflow: eZ Dataflow
+coderhapsodie.ezdataflow: Ibexa Dataflow

src/Resources/translations/menu.fr.yaml

@@ -1 +1 @@
-coderhapsodie.ezdataflow: eZ Dataflow
+coderhapsodie.ezdataflow: Ibexa Dataflow

src/Resources/translations/messages.en.yaml

@@ -1,4 +1,4 @@
-coderhapsodie.ezdataflow: eZ Dataflow
+coderhapsodie.ezdataflow: Ibexa Dataflow
 coderhapsodie.ezdataflow.yes: Yes
 coderhapsodie.ezdataflow.no: No
 coderhapsodie.ezdataflow.repeating: Repeating

src/Resources/translations/messages.fr.yaml

@@ -1,4 +1,4 @@
-coderhapsodie.ezdataflow: eZ Dataflow
+coderhapsodie.ezdataflow: Ibexa Dataflow
 coderhapsodie.ezdataflow.yes: Oui
 coderhapsodie.ezdataflow.no: Non
 coderhapsodie.ezdataflow.repeating: Récurrent

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

@@ -71,22 +71,6 @@
                 .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');
-            if (window.location.hash && window.location.hash === '#oneshot') {
-                labels.forEach((link) => link.classList.remove('active'));
-                tabs.forEach((tab) => tab.classList.remove('active'));
-                document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-oneshot')
-                    .closest('li.ibexa-tabs__tab').classList.add('active');
-                document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-oneshot')
-                    .closest('.tab-pane').classList.add('active');
-            }
-            if (window.location.hash && window.location.hash === '#history') {
-                labels.forEach((link) => link.classList.remove('active'));
-                tabs.forEach((tab) => tab.classList.remove('active'));
-                document.getElementById('ibexa-tab-label-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-history')
-                    .closest('li.ibexa-tabs__tab').classList.add('active');
-                document.getElementById('ibexa-tab-coderhapsodie-ezdataflow-code-rhapsodie-ezdataflow-history')
-                    .closest('.tab-pane').classList.add('active');
-            }
         });
     </script>
 {% endblock %}

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

@@ -44,6 +44,7 @@
                     .then((result) => {
                         if (result.redirect) {
                             window.location = result.redirect;
+                            window.location.reload();
                             return;
                         }
                         const node = document.createElement('div');