IBX-7935: Handled User-related structs in FieldCollectionType dispa…

…tcher

src/bundle/Controller/UserController.php

@@ -17,6 +17,7 @@
 use Ibexa\ContentForms\User\View\UserCreateView;
 use Ibexa\ContentForms\User\View\UserUpdateView;
 use Ibexa\Contracts\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProviderInterface;
+use Ibexa\Contracts\Core\Repository\ContentService;
 use Ibexa\Contracts\Core\Repository\ContentTypeService;
 use Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException;
 use Ibexa\Contracts\Core\Repository\LanguageService;
@@ -53,6 +54,9 @@ class UserController extends Controller
     /** @var \Ibexa\Contracts\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProviderInterface */
     private $groupedContentFormFieldsProvider;
 
+    /** @var \Ibexa\Contracts\Core\Repository\ContentService */
+    private $contentService;
+
     public function __construct(
         ContentTypeService $contentTypeService,
         UserService $userService,
@@ -61,7 +65,8 @@ public function __construct(
         ActionDispatcherInterface $userActionDispatcher,
         PermissionResolver $permissionResolver,
         UserLanguagePreferenceProviderInterface $userLanguagePreferenceProvider,
-        GroupedContentFormFieldsProviderInterface $groupedContentFormFieldsProvider
+        GroupedContentFormFieldsProviderInterface $groupedContentFormFieldsProvider,
+        ContentService $contentService
     ) {
         $this->contentTypeService = $contentTypeService;
         $this->userService = $userService;
@@ -71,6 +76,7 @@ public function __construct(
         $this->permissionResolver = $permissionResolver;
         $this->userLanguagePreferenceProvider = $userLanguagePreferenceProvider;
         $this->groupedContentFormFieldsProvider = $groupedContentFormFieldsProvider;
+        $this->contentService = $contentService;
     }
 
     /**
@@ -114,6 +120,7 @@ public function createAction(
         $form = $this->createForm(UserCreateType::class, $data, [
             'languageCode' => $language->languageCode,
             'mainLanguageCode' => $language->languageCode,
+            'userCreateStruct' => $data,
         ]);
         $form->handleRequest($request);
 
@@ -152,6 +159,7 @@ public function createAction(
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\BadStateException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\InvalidArgumentException
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException
+     * @throws \Ibexa\Contracts\Core\Repository\Exceptions\UnauthorizedException
      * @throws \Ibexa\Core\Base\Exceptions\InvalidArgumentType
      * @throws \Ibexa\Core\Base\Exceptions\UnauthorizedException
      */
@@ -192,8 +200,10 @@ public function editAction(
             $userUpdate,
             [
                 'location' => $location,
+                'content' => $this->contentService->loadContent($contentId),
                 'languageCode' => $language,
                 'mainLanguageCode' => $user->contentInfo->mainLanguageCode,
+                'userUpdateStruct' => $userUpdate,
             ]
         );
         $form->handleRequest($request);

src/bundle/Resources/config/services.yaml

@@ -99,14 +99,15 @@ services:
 
     Ibexa\Bundle\ContentForms\Controller\UserController:
         arguments:
-            - '@ibexa.api.service.content_type'
-            - '@ibexa.api.service.user'
-            - '@ibexa.api.service.location'
-            - '@ibexa.api.service.language'
-            - '@Ibexa\ContentForms\Form\ActionDispatcher\UserDispatcher'
-            - '@Ibexa\Contracts\Core\Repository\PermissionResolver'
-            - '@Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProvider'
-            - '@Ibexa\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProvider'
+            $contentTypeService: '@ibexa.api.service.content_type'
+            $userService: '@ibexa.api.service.user'
+            $locationService: '@ibexa.api.service.location'
+            $languageService: '@ibexa.api.service.language'
+            $userActionDispatcher: '@Ibexa\ContentForms\Form\ActionDispatcher\UserDispatcher'
+            $permissionResolver: '@Ibexa\Contracts\Core\Repository\PermissionResolver'
+            $userLanguagePreferenceProvider: '@Ibexa\Core\MVC\Symfony\Locale\UserLanguagePreferenceProvider'
+            $groupedContentFormFieldsProvider: '@Ibexa\ContentForms\Content\Form\Provider\GroupedContentFormFieldsProvider'
+            $contentService: '@ibexa.api.service.content'
         parent: Ibexa\Core\MVC\Symfony\Controller\Controller
         tags:
               - { name: controller.service_arguments }

src/lib/Event/ContentFormEvents.php

@@ -64,6 +64,16 @@ final class ContentFormEvents
      * Triggered when resolving Field Type options for content create form.
      */
     public const CONTENT_CREATE_FIELD_OPTIONS = 'content.create.field.options';
+
+    /**
+     * Triggered when resolving Field Type options for user edit form.
+     */
+    public const USER_EDIT_FIELD_OPTIONS = 'user.edit.field.options';
+
+    /**
+     * Triggered when resolving Field Type options for user create form.
+     */
+    public const USER_CREATE_FIELD_OPTIONS = 'user.create.field.options';
 }
 
 class_alias(ContentFormEvents::class, 'EzSystems\EzPlatformContentForms\Event\ContentFormEvents');

src/lib/Event/UserCreateFieldOptionsEvent.php

@@ -0,0 +1,82 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\ContentForms\Event;
+
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
+use Ibexa\Contracts\Core\Repository\Values\User\UserCreateStruct;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\EventDispatcher\Event;
+
+final class UserCreateFieldOptionsEvent extends Event
+{
+    /** @var \Ibexa\Contracts\Core\Repository\Values\User\UserCreateStruct */
+    private $userCreateStruct;
+
+    /** @var \Symfony\Component\Form\FormInterface */
+    private $parentForm;
+
+    /** @var \Ibexa\Contracts\ContentForms\Data\Content\FieldData */
+    private $fieldData;
+
+    /** @var array<string, mixed> */
+    private $options;
+
+    public function __construct(
+        UserCreateStruct $userCreateStruct,
+        FormInterface $parentForm,
+        FieldData $fieldData,
+        array $options
+    ) {
+        $this->userCreateStruct = $userCreateStruct;
+        $this->parentForm = $parentForm;
+        $this->fieldData = $fieldData;
+        $this->options = $options;
+    }
+
+    public function getUserCreateStruct(): UserCreateStruct
+    {
+        return $this->userCreateStruct;
+    }
+
+    public function getParentForm(): FormInterface
+    {
+        return $this->parentForm;
+    }
+
+    public function getFieldData(): FieldData
+    {
+        return $this->fieldData;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * @param array<string, mixed> $options
+     */
+    public function setOptions(array $options): void
+    {
+        $this->options = $options;
+    }
+
+    public function setOption(string $option, $value): void
+    {
+        $this->options[$option] = $value;
+    }
+
+    public function getOption(string $option)
+    {
+        return $this->options[$option] ?? null;
+    }
+}

src/lib/Event/UserUpdateFieldOptionsEvent.php

@@ -0,0 +1,98 @@
+<?php
+
+/**
+ * @copyright Copyright (C) Ibexa AS. All rights reserved.
+ * @license For full copyright and license information view LICENSE file distributed with this source code.
+ */
+declare(strict_types=1);
+
+namespace Ibexa\ContentForms\Event;
+
+use Ibexa\Contracts\ContentForms\Data\Content\FieldData;
+use Ibexa\Contracts\Core\Repository\Values\Content\Content;
+use Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Contracts\EventDispatcher\Event;
+
+final class UserUpdateFieldOptionsEvent extends Event
+{
+    /** @var \Ibexa\Contracts\Core\Repository\Values\Content\Content */
+    private $content;
+
+    /** @var \Ibexa\Contracts\Core\Repository\Values\User\UserUpdateStruct */
+    private $userUpdateStruct;
+
+    /** @var \Symfony\Component\Form\FormInterface */
+    private $parentForm;
+
+    /** @var \Ibexa\Contracts\ContentForms\Data\Content\FieldData */
+    private $fieldData;
+
+    /** @var array<string, mixed> */
+    private $options;
+
+    public function __construct(
+        Content $content,
+        UserUpdateStruct $userUpdateStruct,
+        FormInterface $parentForm,
+        FieldData $fieldData,
+        array $options
+    ) {
+        $this->content = $content;
+        $this->userUpdateStruct = $userUpdateStruct;
+        $this->parentForm = $parentForm;
+        $this->fieldData = $fieldData;
+        $this->options = $options;
+    }
+
+    public function getContent(): Content
+    {
+        return $this->content;
+    }
+
+    public function setContent(Content $content): void
+    {
+        $this->content = $content;
+    }
+
+    public function getUserUpdateStruct(): UserUpdateStruct
+    {
+        return $this->userUpdateStruct;
+    }
+
+    public function getParentForm(): FormInterface
+    {
+        return $this->parentForm;
+    }
+
+    public function getFieldData(): FieldData
+    {
+        return $this->fieldData;
+    }
+
+    /**
+     * @return array<string, mixed>
+     */
+    public function getOptions(): array
+    {
+        return $this->options;
+    }
+
+    /**
+     * @param array<string, mixed> $options
+     */
+    public function setOptions(array $options): void
+    {
+        $this->options = $options;
+    }
+
+    public function setOption(string $option, $value): void
+    {
+        $this->options[$option] = $value;
+    }
+
+    public function getOption(string $option)
+    {
+        return $this->options[$option] ?? null;
+    }
+}

src/lib/Form/Type/Content/BaseContentType.php

@@ -43,6 +43,8 @@ public function buildForm(FormBuilderInterface $builder, array $options)
                     'content' => $options['content'] ?? null,
                     'contentCreateStruct' => $options['contentCreateStruct'] ?? null,
                     'contentUpdateStruct' => $options['contentUpdateStruct'] ?? null,
+                    'userCreateStruct' => $options['userCreateStruct'] ?? null,
+                    'userUpdateStruct' => $options['userUpdateStruct'] ?? null,
                 ],
             ])
             ->add('redirectUrlAfterPublish', HiddenType::class, [

src/lib/Form/Type/Content/ContentFieldType.php

@@ -48,6 +48,8 @@ public function configureOptions(OptionsResolver $resolver)
                 'location' => null,
                 'contentCreateStruct' => null,
                 'contentUpdateStruct' => null,
+                'userCreateStruct' => null,
+                'userUpdateStruct' => null,
                 'data_class' => FieldData::class,
                 'translation_domain' => 'ezplatform_content_forms_content',
             ])