feat: properly support translated info collection fields

Author: René Hrdina

bundle/Ibexa/ContentForms/InformationCollectionMapper.php

@@ -21,7 +21,7 @@ final class InformationCollectionMapper
      */
     public function mapToFormData(Content $content, Location $location, ContentType $contentType): InformationCollectionStruct
     {
-        $fields = $content->getFieldsByLanguage($content->contentInfo->mainLanguageCode);
+        $fields = $content->getFieldsByLanguage();
 
         $informationCollectionFields = [];
 

lib/Handler.php

@@ -4,6 +4,7 @@
 
 namespace Netgen\InformationCollection;
 
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Values\Content\Content;
 use Ibexa\Contracts\Core\Repository\Values\Content\Location;
@@ -24,11 +25,19 @@ final class Handler
 
     private EventDispatcherInterface $eventDispatcher;
 
-    public function __construct(FormFactoryInterface $formFactory, ContentTypeService $contentTypeService, EventDispatcherInterface $eventDispatcher)
+    private ConfigResolverInterface $configResolver;
+
+    public function __construct(
+        FormFactoryInterface $formFactory,
+        ContentTypeService $contentTypeService,
+        EventDispatcherInterface $eventDispatcher,
+        ConfigResolverInterface $configResolver
+    )
     {
         $this->formFactory = $formFactory;
         $this->contentTypeService = $contentTypeService;
         $this->eventDispatcher = $eventDispatcher;
+        $this->configResolver = $configResolver;
     }
 
     public function getForm(Content $content, Location $location): FormInterface
@@ -40,11 +49,31 @@ public function getForm(Content $content, Location $location): FormInterface
         $data = $informationCollectionMapper->mapToFormData($content, $location, $contentType);
 
         return $this->formFactory->create(InformationCollectionType::class, $data, [
-            'languageCode' => $content->contentInfo->mainLanguageCode,
+            'languageCode' => $this->determineLanguageToLoad($content),
             'mainLanguageCode' => $content->contentInfo->mainLanguageCode,
         ]);
     }
 
+    /**
+     * @param Content $content
+     * @return string
+     */
+    private function determineLanguageToLoad(Content $content): string
+    {
+        $versionInfo = $content->getVersionInfo();
+
+        $siteAccessLanguagesCodes = (array)$this->configResolver->getParameter('languages');
+        foreach($siteAccessLanguagesCodes as $languageCode)
+        {
+            if (in_array($languageCode, $versionInfo->languageCodes, true))
+            {
+                return $languageCode;
+            }
+        }
+
+        return $content->contentInfo->mainLanguageCode;
+    }
+
     public function handle(InformationCollectionStruct $struct, array $options): void
     {
         $event = new InformationCollected($struct, $options);

lib/Resources/config/services.yml

@@ -95,6 +95,7 @@ services:
             - "@form.factory"
             - "@ibexa.api.service.content_type"
             - "@event_dispatcher"
+            - "@ibexa.config.resolver"
 
     Netgen\InformationCollection\Core\Service\CaptchaService:
         autowire: true