intenseprogramming · skonrad · Apr 12, 2020 · Apr 12, 2020 · Apr 16, 2020 · Apr 16, 2020
diff --git a/.travis.yml b/.travis.yml
@@ -2,9 +2,8 @@ language: php
 
 matrix:
     include:
-        - php: 7.1
-        - php: 7.2
         - php: 7.3
+        - php: 7.4
 
 cache:
     directories:

diff --git a/README.md b/README.md
@@ -16,6 +16,8 @@ The behavior of the relation list is completely controlled by the field definiti
 
 Refer to [the general information](doc/GENERAL.md) and [usage documentation](doc/USAGE.md) for more information.
 
+:heavy_exclamation_mark: Upgrade in progress! :heavy_exclamation_mark:
+
 ## Installation
 
 The installation uses composer and the general concept for adding bundles to a symfony installation.

diff --git a/bundle/Core/FieldType/Mapper.php b/bundle/Core/FieldType/Mapper.php
@@ -11,10 +11,10 @@
 namespace IntProg\EnhancedRelationListBundle\Core\FieldType;
 
 use eZ\Publish\API\Repository\ContentTypeService;
-use EzSystems\RepositoryForms\Data\Content\FieldData;
-use EzSystems\RepositoryForms\Data\FieldDefinitionData;
-use EzSystems\RepositoryForms\FieldType\FieldDefinitionFormMapperInterface;
-use EzSystems\RepositoryForms\FieldType\FieldValueFormMapperInterface;
+use EzSystems\EzPlatformAdminUi\FieldType\FieldDefinitionFormMapperInterface;
+use EzSystems\EzPlatformAdminUi\Form\Data\FieldDefinitionData;
+use EzSystems\EzPlatformContentForms\Data\Content\FieldData;
+use EzSystems\EzPlatformContentForms\FieldType\FieldValueFormMapperInterface;
 use IntProg\EnhancedRelationListBundle\Form\Type\EnhancedRelationListFieldDefinitionAttributesType;
 use IntProg\EnhancedRelationListBundle\Form\Type\EnhancedRelationListFieldDefinitionGroupsType;
 use IntProg\EnhancedRelationListBundle\Form\Type\EnhancedRelationListType;
@@ -54,7 +54,7 @@ public function __construct(ContentTypeService $contentTypeService)
      *
      * @return void
      */
-    public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, FieldDefinitionData $data)
+    public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, FieldDefinitionData $data): void
     {
         $fieldDefinitionForm
             ->add(
@@ -71,7 +71,6 @@ public function mapFieldDefinitionForm(FormInterface $fieldDefinitionForm, Field
                 ChoiceType::class,
                 [
                     'choices'           => $this->getContentTypesHash(),
-                    'choices_as_values' => true,
                     'expanded'          => false,
                     'multiple'          => true,
                     'required'          => false,

diff --git a/bundle/Core/FieldType/Storage.php b/bundle/Core/FieldType/Storage.php
@@ -11,6 +11,7 @@
 namespace IntProg\EnhancedRelationListBundle\Core\FieldType;
 
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use eZ\Publish\SPI\FieldType\GatewayBasedStorage;
 use eZ\Publish\SPI\Persistence\Content\Field;
 use eZ\Publish\SPI\Persistence\Content\Type as FieldType;
@@ -41,13 +42,17 @@ class Storage extends GatewayBasedStorage
      *
      * @param Handler                     $contentTypeHandler
      * @param RelationAttributeRepository $repository
-     * @param array                       $languages
+     * @param ConfigResolverInterface     $configResolver
      */
-    public function __construct(Handler $contentTypeHandler, RelationAttributeRepository $repository, array $languages)
+    public function __construct(
+        Handler $contentTypeHandler,
+        RelationAttributeRepository $repository,
+        ConfigResolverInterface $configResolver
+    )
     {
         $this->contentTypeHandler = $contentTypeHandler;
         $this->repository         = $repository;
-        $this->languages          = $languages;
+        $this->languages          = $configResolver->getParameter('languages');
     }
 
     /**

diff --git a/bundle/Core/FieldType/Type.php b/bundle/Core/FieldType/Type.php
@@ -15,7 +15,6 @@
 use eZ\Publish\Core\FieldType\FieldType;
 use eZ\Publish\Core\FieldType\ValidationError;
 use eZ\Publish\Core\FieldType\Value as CoreValue;
-use eZ\Publish\SPI\FieldType\Nameable;
 use eZ\Publish\SPI\FieldType\Value as SpiValue;
 use IntProg\EnhancedRelationListBundle\Core\FieldType\Value\Group;
 use IntProg\EnhancedRelationListBundle\Core\FieldType\Value\Relation;
@@ -28,7 +27,7 @@
  * @author    Konrad, Steve <s.konrad@wingmail.net>
  * @copyright 2018 Intense Programming
  */
-class Type extends FieldType implements Nameable
+class Type extends FieldType
 {
     /** @var RelationAttributeRepository $relationAttributeTransformer */
     protected $relationAttributeTransformer;
@@ -130,11 +129,13 @@ public function getFieldTypeIdentifier()
     /**
      * Returns a human readable string representation from the given $value.
      *
-     * @param SpiValue $value
+     * @param SpiValue        $value
+     * @param FieldDefinition $fieldDefinition
+     * @param string          $languageCode
      *
      * @return string
      */
-    public function getName(SpiValue $value)
+    public function getName(SpiValue $value, FieldDefinition $fieldDefinition, string $languageCode): string
     {
         return (string) $value;
     }

diff --git a/bundle/Form/Type/EnhancedRelationListFieldDefinitionAttributesType.php b/bundle/Form/Type/EnhancedRelationListFieldDefinitionAttributesType.php
@@ -12,6 +12,7 @@
 
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\LanguageService;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use IntProg\EnhancedRelationListBundle\Core\DataTransformer\FieldDefinitionAttributesTransformer;
 use IntProg\EnhancedRelationListBundle\Service\RelationAttributeRepository;
 use Symfony\Component\Form\AbstractType;
@@ -35,24 +36,25 @@ class EnhancedRelationListFieldDefinitionAttributesType extends AbstractType
     /** @var LanguageService $languageService */
     protected $languageService;
 
+    /** @var array|string[] $languages */
     protected $languages;
 
     /**
      * EnhancedRelationListFieldDefinitionAttributesType constructor.
      *
      * @param RelationAttributeRepository $attributeRepository
      * @param LanguageService             $languageService
-     * @param array                       $languages
+     * @param ConfigResolverInterface     $configResolver
      */
     public function __construct(
         RelationAttributeRepository $attributeRepository,
         LanguageService $languageService,
-        array $languages
+        ConfigResolverInterface $configResolver
     )
     {
         $this->attributeRepository = $attributeRepository;
         $this->languageService     = $languageService;
-        $this->languages           = $languages;
+        $this->languages           = $configResolver->getParameter('languages');
     }
 
     /**

diff --git a/bundle/Form/Type/EnhancedRelationListFieldDefinitionGroupsType.php b/bundle/Form/Type/EnhancedRelationListFieldDefinitionGroupsType.php
@@ -12,6 +12,7 @@
 
 use eZ\Publish\API\Repository\Exceptions\NotFoundException;
 use eZ\Publish\API\Repository\LanguageService;
+use eZ\Publish\Core\MVC\ConfigResolverInterface;
 use IntProg\EnhancedRelationListBundle\Core\DataTransformer\FieldDefinitionGroupsTransformer;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
@@ -28,14 +29,22 @@
  */
 class EnhancedRelationListFieldDefinitionGroupsType extends AbstractType
 {
+    /** @var LanguageService $languageService */
     protected $languageService;
 
+    /** @var array|string[] $languages */
     protected $languages;
 
-    public function __construct(LanguageService $languageService, array $languages)
+    /**
+     * EnhancedRelationListFieldDefinitionGroupsType constructor.
+     *
+     * @param LanguageService         $languageService
+     * @param ConfigResolverInterface $configResolver
+     */
+    public function __construct(LanguageService $languageService, ConfigResolverInterface $configResolver)
     {
         $this->languageService = $languageService;
-        $this->languages       = $languages;
+        $this->languages       = $configResolver->getParameter('languages');
     }
 
     /**

diff --git a/bundle/Resources/assets/js/intprogenhancedrelationlist.js b/bundle/Resources/assets/js/intprogenhancedrelationlist.js
@@ -51,6 +51,7 @@ document.addEventListener('DOMContentLoaded', function _onLoad() {
                             input: jsonValueInput,
                             value: JSON.parse(jsonValueInput.value),
                             cloneContainer: cloneContainer,
+                            udwConfig: JSON.parse(fieldContainer.querySelector('script[data-udw-config]').innerText),
                             udwContainer: udwContainer,
                             udwModule: global.eZ.modules.UniversalDiscovery,
                             settings: JSON.parse(fieldContainer.querySelector('script[data-settings]').innerText),

diff --git a/bundle/Resources/config/ez_field_templates.yml b/bundle/Resources/config/ez_field_templates.yml
@@ -21,8 +21,13 @@ system:
         content_view:
             element_simple_link:
                 default:
-                    controller: 'EzPlatformAdminUiBundle:ContentView:locationView'
-                    template: '@ezdesign/enhanced_relation_list/simple_link.html.twig'
+                    controller: 'ez_content:viewAction'
+                    template: '@ezdesign/enhanced_relation_list/view/default/content/simple_link.html.twig'
+                    match: true
+            element_simple_text:
+                default:
+                    controller: 'ez_content:viewAction'
+                    template: '@ezdesign/enhanced_relation_list/view/default/content/simple_text.html.twig'
                     match: true
         fielddefinition_settings_templates:
             - {template: '@ezdesign/enhanced_relation_list/fielddefinition_settings.html.twig', priority: 0}
diff --git a/bundle/Resources/config/fieldtypes.yml b/bundle/Resources/config/fieldtypes.yml
@@ -23,8 +23,9 @@ services:
 
     IntProg\EnhancedRelationListBundle\Core\FieldType\Storage:
         arguments:
-            - '@ezpublish.spi.persistence.content_type_handler'
-            - '@IntProg\EnhancedRelationListBundle\Service\RelationAttributeRepository'
-            - '$languages$'
+            $contentTypeHandler: '@ezpublish.spi.persistence.content_type_handler'
+            $repository: '@IntProg\EnhancedRelationListBundle\Service\RelationAttributeRepository'
+        lazy: true
+        autowire: true
         tags:
             - { name: ezpublish.fieldType.externalStorageHandler, alias: intprogenhancedrelationlist }
diff --git a/bundle/Resources/config/form.yml b/bundle/Resources/config/form.yml
@@ -7,16 +7,15 @@ services:
             - { name: form.type }
 
     IntProg\EnhancedRelationListBundle\Form\Type\EnhancedRelationListFieldDefinitionGroupsType:
-        arguments:
-            - '@ezpublish.api.service.language'
-            - '$languages$'
+        lazy: true
+        autowire: true
         tags:
             - { name: form.type }
 
     IntProg\EnhancedRelationListBundle\Form\Type\EnhancedRelationListFieldDefinitionAttributesType:
         arguments:
-            - '@IntProg\EnhancedRelationListBundle\Service\RelationAttributeRepository'
-            - '@ezpublish.api.service.language'
-            - '$languages$'
+            $attributeRepository: '@IntProg\EnhancedRelationListBundle\Service\RelationAttributeRepository'
+        lazy: true
+        autowire: true
         tags:
             - { name: form.type }
diff --git a/bundle/Resources/config/templating.yml b/bundle/Resources/config/templating.yml
@@ -3,10 +3,8 @@ services:
         class: IntProg\EnhancedRelationListBundle\Templating\Twig\AttributeBlockRenderer
         calls:
             - [setTwig, ['@twig']]
-            - [setBaseTemplate, ["$enhanced_relation_list.base_template$"]]
-            - [setAttributeViewResources, ["$enhanced_relation_list.attribute_templates$"]]
-            - [setAttributeDefinitionViewResources, ["$enhanced_relation_list.attribute_definition_templates$"]]
         lazy: true
+        autowire: true
 
     intprog.enhanced-relation-list.templating.attribute_block_renderer:
         alias: intprog.enhanced-relation-list.templating.attribute_block_renderer.twig
diff --git a/...nslations/ezrepoforms_content_type.en.yml → ...esources/translations/content_type.en.yml b/...nslations/ezrepoforms_content_type.en.yml → ...esources/translations/content_type.en.yml
diff --git a/bundle/Resources/views/enhanced_relation_list/content/content_edit.html.twig b/bundle/Resources/views/enhanced_relation_list/content/content_edit.html.twig
@@ -9,7 +9,16 @@
             <script data-settings type="application/json">{{ fieldSettings|json_encode|raw }}</script>
             <script data-validation type="application/json">{{ validatorConfiguration|json_encode|raw }}</script>
             <script data-errors type="application/json">{{ attribute_errors|json_encode|raw }}</script>
-            <script data-languages type="application/json">{{ ezpublish.configResolver.parameter('languages')|json_encode|raw }}</script>
+            <script data-languages type="application/json">{{ ezplatform.configResolver.parameter('languages')|json_encode|raw }}</script>
+            <script data-udw-config type="application/json">{%- if limit == 1 %}{{ ez_udw_config('single', {
+                'type': 'object_relation',
+                'starting_location_id' : fieldSettings.defaultBrowseLocation,
+                'allowed_content_types': validatorConfiguration.relationValidator.allowedContentTypes
+            })|raw }}{% else %}{{ ez_udw_config('multiple', {
+                'type': 'object_relation',
+                'starting_location_id' : fieldSettings.defaultBrowseLocation,
+                'allowed_content_types': validatorConfiguration.relationValidator.allowedContentTypes
+            })|raw }}{% endif %}</script>
         </div>
 
         <div><table class="relation-root-table erl-table table drag-clone-container my-0"><tbody> </tbody></table></div>

diff --git a/bundle/Resources/views/enhanced_relation_list/content_fields.html.twig b/bundle/Resources/views/enhanced_relation_list/content_fields.html.twig
@@ -12,7 +12,7 @@
 {% macro render_intprogenhancedrelationlist(content, field, fieldSettings) %}
     {% import _self as erl_table_macros %}
 
-    {% include '@ezdesign/parts/table_header.html.twig' with {headerText: 'field.attribute.table.head.relations'|trans} %}
+    {% include '@ezdesign/ui/table_header.html.twig' with {header_text: 'field.attribute.table.head.relations'|trans} %}
     <table class="table mb-0">
         {{ erl_table_macros.table_head_macro(fieldSettings, field) }}
         <tbody>

diff --git a/bundle/Resources/views/enhanced_relation_list/content_type/field_types.html.twig b/bundle/Resources/views/enhanced_relation_list/content_type/field_types.html.twig
@@ -1,5 +1,5 @@
 
-{% use 'EzPublishCoreBundle::fielddefinition_settings.html.twig' %}
+{% use '@ezdesign/fielddefinition_settings.html.twig' %}
 
 {% trans_default_domain 'enhancedrelationlist_attribute' %}
 
@@ -11,18 +11,18 @@
             {{- form_widget(form.defaultBrowseLocation) -}}
 
             <div class="mt-1">
-                <button data-universaldiscovery-title="{{"field_definition.ezobjectrelationlist.selection_root_udw_title"|trans({}, "ezrepoforms_content_type")}}"
+                <button data-universaldiscovery-title="{{"field_definition.ezobjectrelationlist.selection_root_udw_title"|trans({}, "content_type")}}"
                         class="ez-button-tree pure-button ez-font-icon ez-button ez-relation-pick-root-button btn btn-secondary btn--udw-relation-default-location"
                         data-relation-root-input-selector="#{{form.defaultBrowseLocation.vars.id}}"
                         data-relation-selected-root-name-selector="#{{form.defaultBrowseLocation.vars.id}}-selected-root-name"
                         data-starting-location-id="1"
                     data-udw-config="{{ ez_udw_config('single') }}"
                         data-udw-config="{{ ez_udw_config('single') }}"
-                >{{"field_definition.ezobjectrelationlist.selection_root_udw_button"|trans({}, "ezrepoforms_content_type")}}</button>
+                >{{"field_definition.ezobjectrelationlist.selection_root_udw_button"|trans({}, "content_type")}}</button>
             </div>
             <div id="{{form.defaultBrowseLocation.vars.id}}-selected-root-name">
                 {% if form.defaultBrowseLocation.vars.value is not empty %}
-                    {{ render( controller( "ez_content:viewLocation", {'locationId': form.defaultBrowseLocation.vars.value, 'viewType': '_platformui_content_name'} ) ) }}
+                    {{ render( controller( "ez_content:viewAction", {'locationId': form.defaultBrowseLocation.vars.value, 'viewType': 'element_simple_text', 'layout': false} ) ) }}
                 {% endif %}
             </div>
         </div>

diff --git a/...anced_relation_list/simple_link.html.twig → ...iew/default/content/simple_link.html.twig b/...anced_relation_list/simple_link.html.twig → ...iew/default/content/simple_link.html.twig
@@ -1,5 +1,5 @@
 <a {% if not content.contentInfo.trashed %}
-    href="{{ path('_ezpublishLocation', { 'locationId': locationId } ) }}"
+    href="{{ path('_ez_content_view', { 'contentId': contentId } ) }}"
         {% endif %}>
     {{ content.getName() }}
     {% if content.contentInfo.trashed %}

diff --git a/bundle/Resources/views/enhanced_relation_list/view/default/content/simple_text.html.twig b/bundle/Resources/views/enhanced_relation_list/view/default/content/simple_text.html.twig
@@ -0,0 +1 @@
+{{ content.getName() }}