Main ibx4

.gitignore

@@ -0,0 +1,3 @@
+/vendor
+/composer.lock
+/.idea

composer.json

@@ -7,7 +7,7 @@
     "almaviacx"
   ],
   "homepage": "https://github.com/Novactive/AlmaviaCXCalameoBundle",
-  "type": "ezplatform-bundle",
+  "type": "ibexa-bundle",
   "authors": [
     {
       "name": "AlmaviaCX",
@@ -19,15 +19,13 @@
     "MIT"
   ],
   "require": {
-    "php": "^7.2",
+    "ext-pdo": "*",
+    "php": "^7.4 || ^8.0",
     "ext-json": "*",
-    "doctrine/cache": "^1.10",
-    "ezsystems/ezpublish-kernel": "^7.5",
-    "ezsystems/repository-forms": "^2.5",
-    "guzzlehttp/guzzle": "^6.0",
-    "jms/serializer": "^1.0",
-    "jms/serializer-bundle": "^2.0",
-    "symfony/symfony": "^3.4"
+    "ibexa/core": "^4.2",
+    "jms/serializer": "^3.5",
+    "jms/serializer-bundle": "^3.5",
+    "symfony/var-exporter": "^6.0"
   },
   "autoload": {
     "psr-4": {
@@ -46,6 +44,9 @@
     "phpunit/phpunit": "^9.5"
   },
   "config": {
-    "sort-packages": true
+    "sort-packages": true,
+    "allow-plugins": {
+      "php-http/discovery": true
+    }
   }
 }

src/bundles/APIBundle/Resources/config/services.yml

@@ -15,14 +15,15 @@ services:
     public: false
 
   AlmaviaCX\Calameo\API\HttpClient:
+    lazy: true
     arguments:
       $APIKey: "%almaviacx.calameo.api.key%"
       $APISecret: "%almaviacx.calameo.api.secret%"
       $config: "%almaviacx.calameo.http_client.config%"
 
   AlmaviaCX\Calameo\API\Serializer:
     arguments:
-      $baseSerializer: "@jms_serializer"
+      $baseSerializer: '@JMS\Serializer\SerializerInterface'
 
   AlmaviaCX\Calameo\API\Gateway\:
     resource: "../../../../lib/API/Gateway/*"
@@ -32,3 +33,5 @@ services:
 
   AlmaviaCX\Calameo\API\Service\:
     resource: "../../../../lib/API/Service/*"
+
+  AlmaviaCX\Calameo\Exception\ExceptionThrower:

src/bundles/EzBundle/DependencyInjection/EzCalameoExtension.php

@@ -35,12 +35,12 @@ public function load(array $configs, ContainerBuilder $container): void
     /**
      * Allow an extension to prepend the extension configurations.
      *
-     * @param \Symfony\Component\DependencyInjection\ContainerBuilder $container
+     * @param ContainerBuilder $container
      */
     public function prepend(ContainerBuilder $container)
     {
         $configs = [
-            'field_templates.yml'    => 'ezpublish',
+            'field_templates.yml'    => 'ibexa',
             'twig.yml'    => 'twig',
         ];
 

src/bundles/EzBundle/Resources/config/field_templates.yml

@@ -1,4 +1,4 @@
 system:
     default:
         field_templates:
-            - { template: '@ezdesign/field/calameo_publication_field.html.twig', priority: 10 }
+            - { template: '@ibexadesign/field/calameo_publication_field.html.twig', priority: 10 }

src/bundles/EzBundle/Resources/config/fieldtypes.yml

@@ -14,17 +14,20 @@ services:
   AlmaviaCX\Calameo\Ez\FieldType\CalameoPublication\Type:
     tags:
       - { name: ezpublish.fieldType, alias: calameo_publication }
-      - { name: ezpublish.fieldType.nameable, alias: calameo_publication }
+      - { name: ibexa.field_type, alias: calameo_publication }
 
   AlmaviaCX\Calameo\Ez\FieldType\CalameoPublication\LegacyConverter:
     tags:
       - { name: ezpublish.storageEngine.legacy.converter, alias: calameo_publication }
+      - { name: ibexa.field_type.storage.legacy.converter, alias: calameo_publication }
 
   AlmaviaCX\Calameo\Ez\FieldType\CalameoPublication\FieldStorage:
     tags:
       - { name: ezpublish.fieldType.externalStorageHandler, alias: calameo_publication }
+      - { name: ibexa.field_type.storage.external.handler, alias: calameo_publication }
 
   almaviacx.calameo.fieldtype.indexable.calameo_publication:
-    class: "%ezpublish.fieldType.indexable.unindexed.class%"
+    class: Ibexa\Core\FieldType\Unindexed
     tags:
       - { name: ezpublish.fieldType.indexable, alias: calameo_publication }
+      - { name: ibexa.field_type.indexable, alias: calameo_publication }

src/bundles/EzBundle/Resources/config/services.yml

@@ -15,18 +15,19 @@ services:
     tags:
       - { name: ez.fieldFormMapper.definition, fieldType: calameo_publication }
       - { name: ez.fieldFormMapper.value, fieldType: calameo_publication }
+      - { name: ibexa.admin_ui.field_type.form.mapper.definition, fieldType: calameo_publication }
+      - { name: ibexa.admin_ui.field_type.form.mapper.value, fieldType: calameo_publication }
 
   AlmaviaCX\Calameo\Ez\Form\Type\FieldType\CalameoPublicationFieldType:
 
   AlmaviaCX\Calameo\Ez\FieldType\CalameoPublication\Gateway\DoctrineStorage:
 
+  AlmaviaCX\Calameo\API\HttpClientFactory: ~
+
   almaviacx.calameo.httpclient.siteaccessaware:
     lazy: true
     class: AlmaviaCX\Calameo\API\HttpClient
     decorates: AlmaviaCX\Calameo\API\HttpClient
-    arguments:
-      $APIKey: "$calameo.api.key;almaviacx$"
-      $APISecret: "$calameo.api.secret;almaviacx$"
-      $config: "$calameo.config;almaviacx$"
+    factory: ['@AlmaviaCX\Calameo\API\HttpClientFactory', 'create']
 
   AlmaviaCX\Calameo\Ez\Twig\CalameoTwigExtension:

src/bundles/EzBundle/Resources/config/twig.yml

@@ -1,2 +1,2 @@
 form_themes:
-    - '@ezdesign/fieldtypes/edit/calameo_publication.html.twig'
+    - '@ibexadesign/fieldtypes/edit/calameo_publication.html.twig'

src/bundles/EzBundle/Resources/public/js/scripts/fieldType/calameo_publication.js

@@ -1,6 +1,6 @@
 (function (global) {
-    const SELECTOR_FIELD = '.ez-field-edit--calameo_publication';
-    const SELECTOR_LABEL_WRAPPER = '.ez-field-edit__label-wrapper';
+    const SELECTOR_FIELD = '.ibexa-field-edit--calameo_publication';
+    const SELECTOR_LABEL_WRAPPER = '.ibexa-field-edit__label-wrapper';
 
     class CalameoPublicationPreviewField extends global.eZ.BasePreviewField {
         /**
@@ -9,14 +9,14 @@
          * @param {Event} event
          */
         loadDroppedFilePreview(event) {
-            const preview = this.fieldContainer.querySelector('.ez-field-edit__preview');
-            const nameContainer = preview.querySelector('.ez-field-edit-preview__file-name');
+            const preview = this.fieldContainer.querySelector('.ibexa-field-edit__preview');
+            const nameContainer = preview.querySelector('.ibexa-field-edit-preview__file-name');
             const files = [].slice.call(event.target.files);
 
             nameContainer.innerHTML = files[0].name;
             nameContainer.title = files[0].name;
 
-            preview.querySelector('.ez-field-edit-preview__action--preview').href = URL.createObjectURL(files[0]);
+            preview.querySelector('.ibexa-field-edit-preview__action--preview').href = URL.createObjectURL(files[0]);
         }
     }
 

src/bundles/EzBundle/Resources/public/scss/fieldType/edit/calameo_publication.scss

@@ -1,34 +1,73 @@
-.ez-field-edit--calameo_publication {
-    &.ez-field-edit--with-preview {
-        .ez-field-edit-preview {
-            width: 500px;
-            height: 80px;
-            line-height: 80px;
+$ibexa-color-danger: #db0032;
+$ibexa-color-danger-100: #fbe5ea;
 
-            &__visual {
-                display: flex;
-            }
+$base-font-size: 16px;
+
+@function div($number1, $number2) {
+    @return $number1 / $number2;
+}
+
+@function calculateRem($size) {
+    $remSize: div($size, $base-font-size);
+
+    @return $remSize + 0rem; // + 0rem converts value to proper `rem`
+}
+
+
+@mixin area-invalid {
+    color: $ibexa-color-danger;
+    border-color: $ibexa-color-danger;
+    background-color: $ibexa-color-danger-100;
+
+    .ibexa-btn {
+        background-color: $ibexa-color-danger-100;
+    }
+}
 
-            &__actions {
-                flex: 0 0 100px;
+.ibexa-field-edit--calameo_publication {
+    &.is-invalid {
+        .ibexa-data-source {
+            @include area-invalid();
+        }
+    }
+
+    &.ibexa-field-edit--with-preview {
+        .ibexa-field-edit-preview {
+            &__file-icon {
+                flex: 0 0 calculateRem(32px);
                 display: flex;
                 align-items: center;
-                flex-direction: row;
-                justify-content: space-between;
+                justify-content: center;
             }
 
-            &__action--preview {
-                margin-top: 0;
+            &__visual {
+                grid-template-rows: auto;
             }
 
-            &__file-name {
-                flex: 1 1 auto;
-                font-size: .75rem;
-                text-overflow: ellipsis;
-                white-space: nowrap;
-                overflow: hidden;
-                display: flex;
-                align-items: center;
+            &__media-wrapper {
+                justify-content: start;
+                flex-direction: column;
+                align-items: flex-start;
+                padding: calculateRem(24px);
+            }
+
+            &__file-name-wrapper,
+            &__file-size-wrapper {
+                display: inline-block;
+                font-size: calculateRem(16px);
+                margin-right: calculateRem(40px);
+
+                .ibexa-label {
+                    margin-bottom: 0;
+                }
+            }
+
+            &__file-name-wrapper {
+                max-width: calculateRem(500px);
+            }
+
+            &__file-size-wrapper {
+                max-width: calculateRem(150px);
             }
         }
     }

src/bundles/EzBundle/Resources/views/themes/admin/field/calameo_publication_field.html.twig

@@ -1,5 +1,5 @@
 {# @var publication \AlmaviaCX\Calameo\API\Value\Publication #}
-{% extends '@EzPublishCore/content_fields.html.twig' %}
+{% extends '@IbexaCore/content_fields.html.twig' %}
 
 {% block calameo_publication_field %}
     {% set publication = loadCalameoPublication(field.value) %}
@@ -9,5 +9,11 @@
         {% else %}
             {{ publication.name }} ({{ publication.id }})
         {% endif %}
+    {% else %}
+        <p style="color: orange">ERREUR CALAMEO</p>
+        <pre style="color: grey">
+            publicationId : {{ field.value.publicationId|default }}
+            folderId : {{ field.value.folderId|default }}
+        </pre>
     {% endif %}
 {% endblock %}

src/bundles/EzBundle/Resources/views/themes/admin/fieldtypes/edit/calameo_publication.html.twig

@@ -1,7 +1,7 @@
 {# @var publication \AlmaviaCX\Calameo\API\Value\Publication #}
 {% trans_default_domain 'ezrepoforms_content' %}
 
-{% use '@ezdesign/fieldtypes/edit/binary_base.html.twig' %}
+{% use '@ibexadesign/ui/field_type/edit/binary_base.html.twig' %}
 
 {%- block ezplatform_fieldtype_calameo_publication_row -%}
     {% set widget_container_block_name = 'calameo_publication_widget_container' %}
@@ -12,36 +12,57 @@
 {%- endblock -%}
 
 {% block calameo_publication_preview %}
+    {% set readonly = attr.readonly|default(false) %}
     {% set publication = loadCalameoPublication(form.parent.vars.value.value) %}
-    <div class="ez-field-edit-preview">
-        <div class="ez-field-edit-preview__visual">
-            <div class="ez-field-edit-preview__file-name">{{ publication ? publication.name }}</div>
-        </div>
-        <div class="ez-field-edit-preview__actions">
-            <a class="ez-field-edit-preview__action--preview" href="{{ publication ? publication.viewUrl }}" target="_blank"
-               title="{{ 'ezbinaryfile.action.preview'|trans|desc('Preview') }}" download>
-                <svg class="ez-icon">
-                    <use xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#view"></use>
-                </svg>
-            </a>
-            <button type="button" class="ez-field-edit-preview__action--remove" title="{{ 'ezbinaryfile.action.remove'|trans|desc('Remove') }}">
-                <svg class="ez-icon">
-                    <use xlink:href="/bundles/ezplatformadminui/img/ez-icons.svg#trash"></use>
-                </svg>
-            </button>
+    <div class="ibexa-field-edit-preview">
+        <div class="ibexa-field-edit-preview__visual">
+            <div class="ibexa-field-edit-preview__media-wrapper">
+                <div class="ibexa-field-edit-preview__file-name-wrapper">
+                    <label class="ibexa-label form-label">{{ 'ezbinaryfile.file_name.label'|trans|desc('File name') }}</label>
+                    <p class="ibexa-field-edit-preview__file-name">{{ publication ? publication.name }}</p>
+                </div>
+                <div class="ibexa-field-edit-preview__actions">
+                    <a
+                            class="ibexa-field-edit-preview__action--preview btn ibexa-btn ibexa-btn--ghost ibexa-btn--small" href="{{ publication ? publication.viewUrl }}"
+                            target="_blank"
+                            {{ readonly ? 'disabled' }}
+                    >
+                        <svg class="ibexa-icon ibexa-icon--small">
+                            <use xlink:href="{{ ibexa_icon_path('view') }}"></use>
+                        </svg>
+                        <span class="ibexa-btn__label">{{ 'ezbinaryfile.action.preview'|trans|desc('Preview') }}</span>
+                    </a>
+                    <button
+                            type="button"
+                            class="ibexa-field-edit-preview__action--remove btn ibexa-btn ibexa-btn--ghost ibexa-btn--small"
+                            {{ readonly ? 'disabled' }}
+                    >
+                        <svg class="ibexa-icon ibexa-icon--small">
+                            <use xlink:href="{{ ibexa_icon_path('trash') }}"></use>
+                        </svg>
+                        <span class="ibexa-btn__label">{{ 'ezbinaryfile.action.remove'|trans|desc('Delete') }}</span>
+                    </button>
+                </div>
+            </div>
         </div>
     </div>
 {% endblock %}
 
 {% block calameo_publication_widget_container %}
     {{- form_widget(form.publicationId) -}}
     {{- form_widget(form.folderId) -}}
+
+
+    {% set fieldtype = form.parent %}
+    {% set field_type_descriptions = fieldtype.vars.value.fieldDefinition.descriptions %}
+
     <div{% with { attr: preview_attr } %}{{ block('attributes') }}{% endwith %}>
         {{ block(preview_block_name) }}
     </div>
     <div{% with { attr: widget_wrapper_attr } %}{{ block('attributes') }}{% endwith %}>
-        <div class="ez-data-source">
+        <div class="ibexa-data-source">
             {{ block('binary_base_widget') }}
         </div>
     </div>
-{% endblock %}
+
+{% endblock %}

src/bundles/EzBundle/Resources/views/themes/standard/field/calameo_publication_field.html.twig

@@ -1,5 +1,5 @@
 {# @var publication \AlmaviaCX\Calameo\API\Value\Publication #}
-{% extends '@EzPublishCore/content_fields.html.twig' %}
+{% extends '@IbexaCore/content_fields.html.twig' %}
 
 {% block calameo_publication_field %}
     {% set publicationId = field.value.publicationId %}