Ibexa 4 support

.gitignore

@@ -1,3 +1,4 @@
+.idea
 vendor
 composer.lock
 .php-version

README.md

@@ -1,6 +1,6 @@
 # Onisep Ibexa Imagemap Bundle
 
-This bundle provides an image map field type for Ibexa 3.3+.
+This bundle provides an image map field type for Ibexa 4.0+.
 
 ## Installation
 
@@ -39,7 +39,7 @@ $ bin/console onisep:imagemap:dump-schema --update
 To build admin assets:
 
 ```shell script
-yarn encore prod --config-name=ezplatform
+yarn encore prod --config-name=ibexa
 ```
 
 For the front assets, you need to import the bundle files in your own entry points. For example, if your entry point is 

assets/css/imagemap.contenttype.scss

@@ -21,7 +21,7 @@
     border: 1px solid black;
 
     svg {
-      fill: #17a2b8;
+      fill: #ae1164;
       width: 40px;
       height: 40px;
     }
@@ -41,10 +41,37 @@
   svg {
     width: 50px;
     height: 50px;
-    fill: #17a2b8;
+    fill: #ae1164;
   }
 }
 
 .imagemap-shape {
   cursor: pointer;
 }
+
+.imagemap-edit {
+  .ibexa-field-edit--with-preview .ibexa-field-edit-preview__visual {
+    grid-template-columns: 100% auto;
+    grid-template-rows: 40.125rem auto;
+
+    .ibexa-field-edit-preview__details {
+      display: none;
+    }
+
+    .ibexa-field-edit-preview__media {
+      max-height: 40rem;
+    }
+  }
+}
+
+.imagemap-areas {
+  margin: 1rem 0 1rem 2.5rem;
+}
+
+.imagemap-add {
+  margin-left: 2.5rem;
+}
+
+.imagemap-draw-buttons {
+  margin-bottom: 1rem;
+}

assets/js/imagemap_edit.js

@@ -106,7 +106,7 @@ const initImageMap = function (imageMap) {
 
   const prototype = areas.parentNode.dataset.prototype;
   const map = imageMap.querySelector('.imagemap-map');
-  const image = imageMap.querySelector('.ez-field-edit-preview__media');
+  const image = imageMap.querySelector('.ibexa-field-edit-preview__media');
   const svg = document.createElementNS('http://www.w3.org/2000/svg', 'svg');
   const draw = SVG(svg);
   const parent = image.parentNode;
@@ -168,6 +168,20 @@ const initArea = function (area, map, draw) {
     target.querySelector('option[value="popin"]').hidden = true;
   }
 
+  area.querySelectorAll('.ibexa-dropdown').forEach((dropdownContainer) => {
+    const dropdownAlreadyInitialized = !!global.ibexa.helpers.objectInstances.getInstance(dropdownContainer);
+
+    if (dropdownAlreadyInitialized) {
+      return;
+    }
+
+    const dropdown = new global.ibexa.core.Dropdown({
+      container: dropdownContainer,
+    });
+
+    dropdown.init();
+  });
+
   recreateShape(area, draw);
 }
 

composer.json

@@ -1,6 +1,6 @@
 {
     "name": "onisep/ibexa-imagemap-bundle",
-    "description": "Image map field type for Ibexa 3.3",
+    "description": "Image map field type for Ibexa 4.0+",
     "type": "symfony-bundle",
     "keywords": ["ibexa", "image map"],
     "license": "MIT",
@@ -23,6 +23,16 @@
             "homepage": "https://github.com/onisep/imagemap-bundle/graphs/contributors"
         }
     ],
+    "require": {
+        "php": "^7.4 || ^8.0",
+        "ext-json": "*",
+        "http-interop/http-factory-guzzle": "^1.2",
+        "ibexa/admin-ui": "^4.5.3",
+        "ibexa/core": ">=4.5.3 <4.6.2"
+    },
+    "require-dev": {
+        "phpstan/phpstan": "^1.10"
+    },
     "autoload": {
         "psr-4": {
             "Onisep\\IbexaImageMapBundle\\": "src/"
@@ -33,15 +43,15 @@
             "Onisep\\IbexaImageMapBundle\\Tests\\": "tests/"
         }
     },
-    "require": {
-        "php": ">=7.4",
-        "ext-json": "*",
-        "ezsystems/ezplatform-admin-ui": "^2.3",
-        "ezsystems/ezplatform-kernel": "^1.3"
+    "scripts": {
+        "phpstan": "phpstan analyse -l 1 src"
     },
     "minimum-stability": "dev",
     "prefer-stable": true,
     "config": {
-        "sort-packages": true
+        "sort-packages": true,
+        "allow-plugins": {
+            "php-http/discovery": true
+        }
     }
 }

src/Command/SchemaCommand.php

@@ -28,9 +28,6 @@ public function __construct(Connection $connection)
         $this->connection = $connection;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function configure()
     {
         $this
@@ -40,9 +37,6 @@ protected function configure()
         ;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     protected function execute(InputInterface $input, OutputInterface $output)
     {
         $schemaProvider = new SchemaProvider();

src/DataTransformer/ImageMapTransformer.php

@@ -4,7 +4,7 @@
 
 namespace Onisep\IbexaImageMapBundle\DataTransformer;
 
-use EzSystems\EzPlatformContentForms\FieldType\DataTransformer\ImageValueTransformer;
+use Ibexa\ContentForms\FieldType\DataTransformer\ImageValueTransformer;
 use Onisep\IbexaImageMapBundle\FieldType\ImageMap\Value;
 
 class ImageMapTransformer extends ImageValueTransformer

src/DependencyInjection/Compiler/AddDefaultViewTemplatePass.php

@@ -11,20 +11,20 @@ class AddDefaultViewTemplatePass implements CompilerPassInterface
 {
     public function process(ContainerBuilder $container)
     {
-        $parameter = $container->getParameter('ezsettings.default.content_view_defaults');
+        $parameter = $container->getParameter('ibexa.site_access.config.default.content_view_defaults');
         $parameter['imagemap_embed'] = [
             'default' => [
-                'template' => '@ezdesign/default/content/imagemap_embed.html.twig',
+                'template' => '@ibexadesign/default/content/imagemap_embed.html.twig',
                 'match' => [],
             ],
         ];
         $parameter['imagemap_popin'] = [
             'default' => [
-                'template' => '@ezdesign/default/content/imagemap_popin.html.twig',
+                'template' => '@ibexadesign/default/content/imagemap_popin.html.twig',
                 'match' => [],
             ],
         ];
 
-        $container->setParameter('ezsettings.default.content_view_defaults', $parameter);
+        $container->setParameter('ibexa.site_access.config.default.content_view_defaults', $parameter);
     }
 }

src/DependencyInjection/OnisepImageMapExtension.php

@@ -24,7 +24,7 @@ public function prepend(ContainerBuilder $container)
     {
         $adminUiFormsConfigFile = __DIR__.'/../Resources/config/admin_ui_forms.yaml';
         $config = Yaml::parseFile($adminUiFormsConfigFile);
-        $container->prependExtensionConfig('ezpublish', $config);
+        $container->prependExtensionConfig('ibexa', $config);
         $container->addResource(new FileResource($adminUiFormsConfigFile));
     }
 }

src/FieldType/ImageMap/FieldValueConverter.php

@@ -4,10 +4,10 @@
 
 namespace Onisep\IbexaImageMapBundle\FieldType\ImageMap;
 
-use eZ\Publish\Core\FieldType\FieldSettings;
-use eZ\Publish\Core\Persistence\Legacy\Content\FieldValue\Converter\ImageConverter;
-use eZ\Publish\Core\Persistence\Legacy\Content\StorageFieldDefinition;
-use eZ\Publish\SPI\Persistence\Content\Type\FieldDefinition;
+use Ibexa\Contracts\Core\Persistence\Content\Type\FieldDefinition;
+use Ibexa\Core\FieldType\FieldSettings;
+use Ibexa\Core\Persistence\Legacy\Content\FieldValue\Converter\ImageConverter;
+use Ibexa\Core\Persistence\Legacy\Content\StorageFieldDefinition;
 
 class FieldValueConverter extends ImageConverter
 {

src/FieldType/ImageMap/ImageMapStorage/Gateway/LegacyStorage.php

@@ -4,8 +4,8 @@
 
 namespace Onisep\IbexaImageMapBundle\FieldType\ImageMap\ImageMapStorage\Gateway;
 
-use eZ\Publish\SPI\Persistence\Content\Field;
-use eZ\Publish\SPI\Persistence\Content\VersionInfo;
+use Ibexa\Contracts\Core\Persistence\Content\Field;
+use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
 use Onisep\IbexaImageMapBundle\Database\ImageMapRepository;
 
 class LegacyStorage
@@ -29,7 +29,7 @@ public function saveMap(VersionInfo $versionInfo, Field $field): void
 
         $exists = $this->repository->get($fieldId, $version);
 
-        if ($exists) {
+        if ($exists !== null) {
             $this->repository->update($fieldId, $version, $field->value->data['map']);
 
             return;

src/FieldType/ImageMap/Storage.php

@@ -4,16 +4,15 @@
 
 namespace Onisep\IbexaImageMapBundle\FieldType\ImageMap;
 
-use eZ\Publish\Core\Base\Utils\DeprecationWarnerInterface as DeprecationWarner;
-use eZ\Publish\Core\FieldType\Image\AliasCleanerInterface;
-use eZ\Publish\Core\FieldType\Image\ImageStorage;
-use eZ\Publish\Core\FieldType\Image\ImageStorage\Gateway as ImageStorageGateway;
-use eZ\Publish\Core\FieldType\Image\PathGenerator;
-use eZ\Publish\Core\IO\FilePathNormalizerInterface;
-use eZ\Publish\Core\IO\IOServiceInterface;
-use eZ\Publish\Core\IO\MetadataHandler;
-use eZ\Publish\SPI\Persistence\Content\Field;
-use eZ\Publish\SPI\Persistence\Content\VersionInfo;
+use Ibexa\Contracts\Core\FieldType\StorageGatewayInterface;
+use Ibexa\Contracts\Core\Persistence\Content\Field;
+use Ibexa\Contracts\Core\Persistence\Content\VersionInfo;
+use Ibexa\Core\FieldType\Image\AliasCleanerInterface;
+use Ibexa\Core\FieldType\Image\ImageStorage;
+use Ibexa\Core\FieldType\Image\PathGenerator;
+use Ibexa\Core\IO\FilePathNormalizerInterface;
+use Ibexa\Core\IO\IOServiceInterface;
+use Ibexa\Core\IO\MetadataHandler;
 use Onisep\IbexaImageMapBundle\FieldType\ImageMap\ImageMapStorage\Gateway\LegacyStorage as ImageMapStorageGateway;
 
 /**
@@ -24,16 +23,15 @@ class Storage extends ImageStorage
     private ImageMapStorageGateway $imageMapGateway;
 
     public function __construct(
-        ImageStorageGateway $baseGateway,
-        IOServiceInterface $IOService,
+        StorageGatewayInterface $gateway,
+        IOServiceInterface $ioService,
         PathGenerator $pathGenerator,
         MetadataHandler $imageSizeMetadataHandler,
-        DeprecationWarner $deprecationWarner,
-        ImageMapStorageGateway $imageMapGateway,
         AliasCleanerInterface $aliasCleaner,
-        FilePathNormalizerInterface $filePathNormalizer
+        FilePathNormalizerInterface $filePathNormalizer,
+        ImageMapStorageGateway $imageMapGateway
     ) {
-        parent::__construct($baseGateway, $IOService, $pathGenerator, $imageSizeMetadataHandler, $deprecationWarner, $aliasCleaner, $filePathNormalizer);
+        parent::__construct($gateway, $ioService, $pathGenerator, $imageSizeMetadataHandler, $aliasCleaner, $filePathNormalizer);
 
         $this->imageMapGateway = $imageMapGateway;
     }

src/FieldType/ImageMap/Type.php

@@ -4,9 +4,9 @@
 
 namespace Onisep\IbexaImageMapBundle\FieldType\ImageMap;
 
-use eZ\Publish\Core\FieldType\Image\Type as ImageType;
-use eZ\Publish\SPI\FieldType\Value as SPIValue;
-use eZ\Publish\SPI\Persistence\Content\FieldValue as PersistenceValue;
+use Ibexa\Contracts\Core\FieldType\Value as SPIValue;
+use Ibexa\Contracts\Core\Persistence\Content\FieldValue as PersistenceValue;
+use Ibexa\Core\FieldType\Image\Type as ImageType;
 
 /**
  * The ImageMap field type.
@@ -18,7 +18,7 @@ public function getFieldTypeIdentifier()
         return 'imagemap';
     }
 
-    public function validateFieldSettings($fieldSettings)
+    public function validateFieldSettings($fieldSettings): array
     {
         return [];
     }

src/FieldType/ImageMap/Value.php

@@ -4,7 +4,7 @@
 
 namespace Onisep\IbexaImageMapBundle\FieldType\ImageMap;
 
-use eZ\Publish\Core\FieldType\Image\Value as ImageValue;
+use Ibexa\Core\FieldType\Image\Value as ImageValue;
 
 /**
  * Value for ImageMap field type.

src/Form/ImageMapType.php

@@ -4,7 +4,7 @@
 
 namespace Onisep\IbexaImageMapBundle\Form;
 
-use EzSystems\EzPlatformContentForms\Form\Type\FieldType\ImageFieldType;
+use Ibexa\ContentForms\Form\Type\FieldType\ImageFieldType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 

src/Form/LinkType.php

@@ -4,7 +4,7 @@
 
 namespace Onisep\IbexaImageMapBundle\Form;
 
-use eZ\Publish\API\Repository\ContentService;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormInterface;

src/FormMapper/ImageMapFormMapper.php

@@ -4,13 +4,13 @@
 
 namespace Onisep\IbexaImageMapBundle\FormMapper;
 
-use eZ\Publish\API\Repository\ContentTypeService;
-use eZ\Publish\API\Repository\FieldTypeService;
-use eZ\Publish\API\Repository\LocationService;
-use EzSystems\EzPlatformAdminUi\FieldType\Mapper\AbstractRelationFormMapper;
-use EzSystems\EzPlatformAdminUi\Form\Data\FieldDefinitionData;
-use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
-use EzSystems\EzPlatformContentForms\FieldType\FieldValueFormMapperInterface;
+use Ibexa\AdminUi\FieldType\Mapper\AbstractRelationFormMapper;
+use Ibexa\AdminUi\Form\Data\FieldDefinitionData;
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
+use Ibexa\Contracts\ContentForms\FieldType\FieldValueFormMapperInterface;
+use Ibexa\Contracts\Core\Repository\ContentTypeService;
+use Ibexa\Contracts\Core\Repository\FieldTypeService;
+use Ibexa\Contracts\Core\Repository\LocationService;
 use Onisep\IbexaImageMapBundle\DataTransformer\ImageMapTransformer;
 use Onisep\IbexaImageMapBundle\FieldType\ImageMap\Value;
 use Onisep\IbexaImageMapBundle\Form\ImageMapType;

src/Resources/config/admin_ui_forms.yaml

@@ -2,8 +2,8 @@ system:
     admin_group:
         admin_ui_forms:
             content_edit_form_templates:
-                - { template: '@ezdesign/content/imagemap_form_fields.html.twig', priority: 1 }
+                - { template: '@ibexadesign/content/imagemap_form_fields.html.twig', priority: 1 }
 
     default:
         field_templates:
-            - { template: '@ezdesign/fields/imagemap_content_fields.html.twig', priority: 0 }
+            - { template: '@ibexadesign/fields/imagemap_content_fields.html.twig', priority: 0 }