IBX-10936: Add expression parser configuration

Author: barw4

src/bundle/Controller/ContentTypeFieldsByExpressionController.php

@@ -40,7 +40,10 @@ public function loadFieldDefinitionsFromExpression(Request $request): FieldDefin
         );
 
         try {
-            $fieldDefinitions = $this->fieldsByExpressionService->getFieldsFromExpression($input->expression);
+            $fieldDefinitions = $this->fieldsByExpressionService->getFieldsFromExpression(
+                $input->expression,
+                $input->configuration,
+            );
         } catch (FieldTypeExpressionParserException | LogicException $e) {
             throw new BadRequestException($e->getMessage(), $e->getCode(), $e);
         }

src/bundle/DependencyInjection/Configuration/Parser/ContentTypeFieldsByExpression.php

@@ -0,0 +1,66 @@
+<?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\Bundle\AdminUi\DependencyInjection\Configuration\Parser;
+
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\AbstractParser;
+use Ibexa\Bundle\Core\DependencyInjection\Configuration\SiteAccessAware\ContextualizerInterface;
+use Symfony\Component\Config\Definition\Builder\NodeBuilder;
+
+/**
+ * Configuration parser for mapping content type fields expressions.
+ *
+ * Example configuration:
+ *
+ * ```yaml
+ * ibexa:
+ *   system:
+ *      default:
+ *          content_type_fields_by_expression:
+ *              configurations:
+ *                  text_fields: [ezstring, eztext]
+ * ```
+ */
+final class ContentTypeFieldsByExpression extends AbstractParser
+{
+    public function addSemanticConfig(NodeBuilder $nodeBuilder): void
+    {
+        $nodeBuilder
+            ->arrayNode('content_type_fields_by_expression')
+                ->addDefaultsIfNotSet()
+                ->children()
+                    ->arrayNode('configurations')
+                        ->useAttributeAsKey('name')
+                        ->arrayPrototype()
+                            ->scalarPrototype()->end()
+                        ->end()
+                        ->defaultValue([])
+                    ->end()
+                ->end()
+            ->end();
+    }
+
+    /**
+     * @param array<string,mixed> $scopeSettings
+     */
+    public function mapConfig(array &$scopeSettings, $currentScope, ContextualizerInterface $contextualizer): void
+    {
+        if (!isset($scopeSettings['content_type_fields_by_expression'])) {
+            return;
+        }
+
+        $configurations = $scopeSettings['content_type_fields_by_expression']['configurations'] ?? [];
+        foreach ($configurations as $name => $config) {
+            $contextualizer->setContextualParameter(
+                "content_type_fields_by_expression.configurations.$name",
+                $currentScope,
+                $config
+            );
+        }
+    }
+}

src/bundle/IbexaAdminUiBundle.php

@@ -71,6 +71,7 @@ private function getConfigParsers(): array
             new Parser\AdminUiForms(),
             new Parser\ContentType(),
             new Parser\ContentTypeGroup(),
+            new Parser\ContentTypeFieldsByExpression(),
             new Parser\SubtreePath(),
             new Parser\LimitationValueTemplates(),
             new Parser\Assets(),

src/contracts/ContentType/ContentTypeFieldsByExpressionServiceInterface.php

@@ -19,7 +19,7 @@ interface ContentTypeFieldsByExpressionServiceInterface
      * @throws \Ibexa\AdminUi\Exception\FieldTypeExpressionParserException
      * @throws \LogicException
      */
-    public function getFieldsFromExpression(string $expression): array;
+    public function getFieldsFromExpression(string $expression, ?string $configuration = null): array;
 
     /**
      * @throws \Ibexa\Contracts\Core\Repository\Exceptions\NotFoundException

src/lib/ContentType/ContentTypeFieldsByExpressionService.php

@@ -14,6 +14,7 @@
 use Ibexa\Contracts\Core\Persistence\Content\Type\Handler as ContentTypeHandler;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\ContentType;
 use Ibexa\Contracts\Core\Repository\Values\ContentType\FieldDefinition;
+use Ibexa\Contracts\Core\SiteAccess\ConfigResolverInterface;
 use Ibexa\Core\FieldType\FieldTypeRegistry;
 use Ibexa\Core\Repository\Mapper\ContentTypeDomainMapper;
 
@@ -25,32 +26,49 @@ final class ContentTypeFieldsByExpressionService implements ContentTypeFieldsByE
 
     private ContentTypeDomainMapper $contentTypeDomainMapper;
 
+    private ConfigResolverInterface $configResolver;
+
     public function __construct(
         ContentTypeFieldsExtractorInterface $fieldsExtractor,
         ContentTypeHandler $contentTypeHandler,
         ContentLanguageHandler $contentLanguageHandler,
-        FieldTypeRegistry $fieldTypeRegistry
+        FieldTypeRegistry $fieldTypeRegistry,
+        ConfigResolverInterface $configResolver
     ) {
         $this->fieldsExtractor = $fieldsExtractor;
         $this->contentTypeHandler = $contentTypeHandler;
         // Building ContentTypeDomainMapper manually to avoid circular dependency.
+        //TODO handle after core merge
         $this->contentTypeDomainMapper = new ContentTypeDomainMapper(
             $contentTypeHandler,
             $contentLanguageHandler,
             $fieldTypeRegistry,
         );
+        $this->configResolver = $configResolver;
     }
 
-    public function getFieldsFromExpression(string $expression): array
+    public function getFieldsFromExpression(string $expression, ?string $configuration = null): array
     {
         $contentTypeFieldIds = $this->fieldsExtractor->extractFieldsFromExpression($expression);
 
+        $configuration = $configuration !== null
+            ? $this->configResolver->getParameter("content_type_fields_by_expression.configurations.$configuration")
+            : null;
+
         $contentTypeFieldDefinitions = [];
         foreach ($contentTypeFieldIds as $contentTypeFieldId) {
             $persistenceFieldDefinition = $this->contentTypeHandler->getFieldDefinition(
                 $contentTypeFieldId,
                 ContentType::STATUS_DEFINED,
             );
+
+            if (
+                $configuration !== null
+                && !in_array($persistenceFieldDefinition->fieldType, $configuration, true)
+            ) {
+                continue;
+            }
+
             $apiFieldDefinition = $this->contentTypeDomainMapper->buildFieldDefinitionDomainObject(
                 $persistenceFieldDefinition,
                 $persistenceFieldDefinition->mainLanguageCode,

src/lib/REST/Input/Parser/ContentType/FieldDefinitionExpression.php

@@ -23,6 +23,6 @@ public function parse(array $data, ParsingDispatcher $parsingDispatcher): FieldD
             );
         }
 
-        return new FieldDefinitionExpressionValue($data['expression']);
+        return new FieldDefinitionExpressionValue($data['expression'], $data['configuration'] ?? null);
     }
 }

src/lib/REST/Value/ContentType/FieldDefinitionExpression.php

@@ -14,8 +14,11 @@ final class FieldDefinitionExpression extends RestValue
 {
     public string $expression;
 
-    public function __construct(string $expression)
+    public ?string $configuration = null;
+
+    public function __construct(string $expression, ?string $configuration = null)
     {
         $this->expression = $expression;
+        $this->configuration = $configuration;
     }
 }