wip

larriereguichet · Oct 26, 2023 · 94f170e · 94f170e
1 parent 08bb0ee
commit 94f170e
Show file tree

Hide file tree

Showing 119 changed files with 1,496 additions and 783 deletions.
diff --git a/README.md b/README.md
@@ -7,6 +7,13 @@
 [![SensioLabsInsight](https://insight.sensiolabs.com/projects/c8e28654-44c7-46f3-9450-497e37bda3d0/mini.png)](https://insight.sensiolabs.com/projects/c8e28654-44c7-46f3-9450-497e37bda3d0)
 [![Total Downloads](https://poser.pugx.org/lag/adminbundle/downloads)](https://packagist.org/packages/lag/adminbundle)
 
+# TODO
+- validation groups
+- serialization
+- set nullable resource arrays to add difference between empty set array and not set array
+- check validation php attributes of metadata
+- batch actions
+
 # AdminBundle
 The AdminBundle let you create a **flexible** and **robust backoffice** on any Symfony application, with simple `yaml` configuration.
 

diff --git a/assets/scss/admin.scss b/assets/scss/admin.scss
@@ -4,3 +4,4 @@
 @import "partials/list";
 @import "partials/login";
 @import "partials/header";
+@import "partials/table";
diff --git a/assets/scss/partials/_table.scss b/assets/scss/partials/_table.scss
@@ -0,0 +1,7 @@
+.admin-table.table {
+    @for $i from 1 through 3 {
+        .column-button-#{$i} {
+            min-width: $i * 130px;
+        }
+    }
+}
diff --git a/config/services/controllers.yaml b/config/services/controllers.yaml
@@ -1,50 +1,21 @@
 services:
-    LAG\AdminBundle\Controller\Security\Login:
-        arguments:
-            $formFactory: '@form.factory'
-            $environment: '@twig'
-            $authenticationUtils: '@security.authentication_utils'
-        tags: ['controller.service_arguments']
-
-    LAG\AdminBundle\Controller\Index:
-        arguments:
-            $uriVariablesExtractor: '@lag_admin.request_uri_variables_extractor'
-            $contextProvider: '@lag_admin.request.context_provider'
-            $dataProvider: '@lag_admin.state.data_provider'
-            $formFactory: '@form.factory'
-            $gridFactory: '@lag_admin.grid.factory'
-            $environment: '@twig'
-        tags: ['controller.service_arguments']
-
-    LAG\AdminBundle\Controller\Create:
-        arguments:
-            $uriVariablesExtractor: '@lag_admin.request_uri_variables_extractor'
-            $contextProvider: '@lag_admin.request.context_provider'
-            $dataProvider: '@lag_admin.state.data_provider'
-            $dataProcessor: '@lag_admin.state.data_processor'
-            $formFactory: '@form.factory'
-            $environment: '@twig'
-            $urlGenerator: '@lag_admin.routing.url_generator'
-        tags: [ 'controller.service_arguments' ]
-
-    LAG\AdminBundle\Controller\Update:
+    LAG\AdminBundle\Controller\Resource\ResourceController:
         arguments:
             $uriVariablesExtractor: '@lag_admin.request_uri_variables_extractor'
             $contextProvider: '@lag_admin.request.context_provider'
             $dataProvider: '@lag_admin.state.data_provider'
             $dataProcessor: '@lag_admin.state.data_processor'
             $formFactory: '@form.factory'
             $environment: '@twig'
-            $urlGenerator: '@lag_admin.routing.url_generator'
+            $responseHandler: '@RedirectionHandler'
         tags: ['controller.service_arguments']
 
-    LAG\AdminBundle\Controller\Delete:
+    LAG\AdminBundle\Controller\Resource\ResourceCollectionController:
         arguments:
             $uriVariablesExtractor: '@lag_admin.request_uri_variables_extractor'
             $contextProvider: '@lag_admin.request.context_provider'
             $dataProvider: '@lag_admin.state.data_provider'
-            $dataProcessor: '@lag_admin.state.data_processor'
             $formFactory: '@form.factory'
+            $gridFactory: '@lag_admin.grid.factory'
             $environment: '@twig'
-            $urlGenerator: '@lag_admin.routing.url_generator'
-        tags: [ 'controller.service_arguments' ]
+        tags: ['controller.service_arguments']
diff --git a/config/services/event_listeners.yaml b/config/services/event_listeners.yaml
@@ -1,42 +1,51 @@
 services:
+    lag_admin.resource.dispatcher: '@LAG\AdminBundle\Event\Dispatcher\ResourceEventDispatcher'
+
     # Resource listeners
     LAG\AdminBundle\EventListener\Resource\ResourceCreateListener:
         arguments:
             $routeNameGenerator: '@lag_admin.routing.route_name_generator'
             $applicationConfiguration: '@lag_admin.application'
         tags:
-            - { name: kernel.event_listener, event: lag_admin.resource.create, priority: 255 }
+            - {name: kernel.event_listener, event: lag_admin.resource.create, priority: 255}
 
     LAG\AdminBundle\EventListener\Resource\ResourceCreatedListener:
         arguments:
             $routeNameGenerator: '@lag_admin.routing.route_name_generator'
         tags:
-            - { name: kernel.event_listener, event: lag_admin.resource.created, priority: 255 }
+            - {name: kernel.event_listener, event: lag_admin.resource.created, priority: 255}
 
     # Operation listeners
-    LAG\AdminBundle\EventListener\Operation\OperationCreateListener:
+    LAG\AdminBundle\EventListener\Operation\DefaultOperationListener:
         tags:
-            - { name: kernel.event_listener, event: lag_admin.operation.create, priority: 255 }
+            - {name: kernel.event_listener, event: lag_admin.operation.create, priority: 255}
 
     LAG\AdminBundle\EventListener\Operation\OperationPathListener:
         tags:
-            - { name: kernel.event_listener, event: lag_admin.operation.create, priority: -255 }
+            - {name: kernel.event_listener, event: lag_admin.operation.create, priority: -255}
 
     # Security listeners
-    LAG\AdminBundle\EventListener\Security\RequestListener:
+    LAG\AdminBundle\EventListener\Security\OperationPermissionListener:
         arguments:
+            $resourceContext: '@lag_admin.resource.context'
             $security: '@security.helper'
         tags:
-            - { name: kernel.event_listener, event: kernel.controller_arguments, priority: 0 }
+            - {name: kernel.event_listener, event: kernel.request}
 
     # Data listeners
     LAG\AdminBundle\EventListener\Data\TimestampableListener:
         tags:
-            - { name: kernel.event_listener, event: lag_admin.data.process, priority: 255 }
+            - {name: kernel.event_listener, event: lag_admin.data.process, priority: 255}
 
     LAG\AdminBundle\EventListener\Data\SlugListener:
         arguments:
             $generator: '@lag_admin.slug.generator'
             $mapping: '@LAG\AdminBundle\Slug\Mapping\SlugMapping'
         tags:
-            - { name: kernel.event_listener, event: lag_admin.data.process, priority: 255 }
+            - {name: kernel.event_listener, event: lag_admin.data.process, priority: 255}
+
+    # Dispatcher
+    LAG\AdminBundle\Event\Dispatcher\ResourceEventDispatcherInterface: '@LAG\AdminBundle\Event\Dispatcher\ResourceEventDispatcher'
+    LAG\AdminBundle\Event\Dispatcher\ResourceEventDispatcher:
+        arguments:
+            $eventDispatcher: '@event_dispatcher'
diff --git a/config/services/forms.yaml b/config/services/forms.yaml
@@ -27,11 +27,17 @@ services:
 
     LAG\AdminBundle\Form\Type\Image\ImageType:
         tags: [ 'form.type' ]
+
     LAG\AdminBundle\Form\Type\Image\ImageChoiceType:
         arguments:
             $transformer: '@LAG\AdminBundle\Form\Transformer\ImageFileToArrayTransformer'
         tags: [ 'form.type' ]
 
+    LAG\AdminBundle\Form\Type\Resource\ResourceChoiceType:
+        arguments:
+            $registry: '@lag_admin.resource.registry'
+            $dataProvider: '@lag_admin.state.data_provider'
+
     ### Form Extensions ###
     LAG\AdminBundle\Form\Extension\CollectionTypeExtension:
         tags: ['form.type_extension']

diff --git a/config/services/knp_menu.yaml b/config/services/knp_menu.yaml
@@ -8,14 +8,14 @@ services:
             $routeNameGenerator: '@lag_admin.routing.route_name_generator'
             $eventDispatcher: '@event_dispatcher'
         tags:
-            - { name: knp_menu.menu_builder, method: build, alias: contextual }
+            - {name: knp_menu.menu_builder, method: build, alias: contextual}
 
     LAG\AdminBundle\Bridge\KnpMenu\Builder\UserMenuBuilder:
         arguments:
             $factory: '@knp_menu.factory'
             $eventDispatcher: '@event_dispatcher'
         tags:
-            - { name: knp_menu.menu_builder, method: build, alias: user }
+            - {name: knp_menu.menu_builder, method: build, alias: user}
 
     LAG\AdminBundle\Bridge\KnpMenu\Builder\ResourceMenuBuilder:
         arguments:
@@ -24,4 +24,4 @@ services:
             $routeNameGenerator: '@lag_admin.routing.route_name_generator'
             $eventDispatcher: '@event_dispatcher'
         tags:
-            - { name: knp_menu.menu_builder, method: build, alias: resource }
+            - {name: knp_menu.menu_builder, method: build, alias: resource}
diff --git a/config/services/doctrine_orm.yaml → config/services/orm.yaml b/config/services/doctrine_orm.yaml → config/services/orm.yaml
@@ -4,27 +4,27 @@ services:
         arguments:
             $registry: '@doctrine'
         tags:
-            - { name: lag_admin.data_provider, identifier: doctrine }
+            - {name: lag_admin.data_provider, identifier: doctrine, priority: 0}
 
     # Data providers
     LAG\AdminBundle\Bridge\Doctrine\ORM\State\ORMDataProcessor:
         arguments:
             $registry: '@doctrine'
         tags:
-            - { name: lag_admin.data_processor, identifier: doctrine }
+            - {name: lag_admin.data_processor, identifier: doctrine, priority: 0}
 
     # Event listeners
     LAG\AdminBundle\Bridge\Doctrine\ORM\EventListener\ResourceCreateListener:
         arguments:
             $propertyFactory: '@lag_admin.orm.property_factory'
         tags:
-            - { name: kernel.event_listener, event: lag_admin.resource.create, priority: 200 }
+            - {name: kernel.event_listener, event: lag_admin.resource.create, priority: 200}
 
     LAG\AdminBundle\Bridge\Doctrine\ORM\EventListener\OperationCreateListener:
         arguments:
             $filterFactory: '@lag_admin.filter.factory'
         tags:
-            - { name: kernel.event_listener, event: lag_admin.operation.create, priority: 256 }
+            - {name: kernel.event_listener, event: lag_admin.operation.create, priority: 256}
 
     # Property provider
     lag_admin.orm.property_factory: '@LAG\AdminBundle\Bridge\Doctrine\ORM\Metadata\MetadataPropertyFactoryInterface'

diff --git a/config/services/request.yaml b/config/services/request.yaml
@@ -1,9 +1,10 @@
 services:
+    # Controller parameter resolvers
     LAG\AdminBundle\Request\Resolver\ResourceValueResolver:
         arguments:
             $resourceContext: '@lag_admin.resource.context'
         tags:
-            - { name: controller.argument_value_resolver, priority: 255 }
+            - {name: controller.argument_value_resolver, priority: 255}
 
     lag_admin.request.parameters_extractor: '@LAG\AdminBundle\Request\Extractor\ParametersExtractorInterface'
     LAG\AdminBundle\Request\Extractor\ParametersExtractorInterface:
@@ -13,6 +14,29 @@ services:
     LAG\AdminBundle\Request\Uri\UriVariablesExtractorInterface:
         class: LAG\AdminBundle\Request\Uri\UriVariablesExtractor
 
+    # Request context resolvers
     lag_admin.request.context_provider: '@LAG\AdminBundle\Request\Context\ContextProviderInterface'
     LAG\AdminBundle\Request\Context\ContextProviderInterface:
-        class: LAG\AdminBundle\Request\Context\ContextProvider
+        class: LAG\AdminBundle\Request\Context\CompositeContextProvider
+        arguments:
+            $contextProviders: !tagged_iterator lag_admin.request_context_provider
+
+    LAG\AdminBundle\Request\Context\SortingContextProvider:
+        tags:
+            - {name: lag_admin.request_context_provider, priority: 255}
+
+    LAG\AdminBundle\Request\Context\AjaxContextProvider:
+        tags:
+            - {name: lag_admin.request_context_provider, priority: 255}
+
+    LAG\AdminBundle\Request\Context\FilterContextProvider:
+        arguments:
+            $formFactory: '@form.factory'
+        tags:
+            - {name: lag_admin.request_context_provider, priority: 255}
+
+    # Redirection handler
+    LAG\AdminBundle\Response\Handler\ResponseHandlerInterface:
+        class: LAG\AdminBundle\Response\Handler\ResponseHandler
+        arguments:
+            $urlGenerator: '@LAG\AdminBundle\Routing\UrlGenerator\UrlGenerator'
diff --git a/config/services/routing.yaml b/config/services/routing.yaml
@@ -1,5 +1,5 @@
 services:
-    LAG\AdminBundle\Routing\Loader\RoutingLoader:
+    LAG\AdminBundle\Routing\Loader\ResourceRoutingLoader:
         arguments:
             $pathGenerator: '@lag_admin.routing.path_generator'
             $resourceRegistry: '@lag_admin.resource.registry'

diff --git a/config/services/security.yaml b/config/services/security.yaml
@@ -1,6 +1,6 @@
 services:
-    lag_admin.security.helper: '@LAG\AdminBundle\Security\Helper\SecurityHelper'
-    LAG\AdminBundle\Security\Helper\SecurityHelper:
+    # Voters
+    LAG\AdminBundle\Security\Voter\OperationPermissionVoter:
         arguments:
             $security: '@security.helper'
-            $registry: '@lag_admin.resource.registry'
+        tags: ['security.voter']
diff --git a/config/services/slug.yaml b/config/services/slug.yaml
@@ -6,7 +6,7 @@ services:
 
     LAG\AdminBundle\Slug\Generator\SimpleSlugGenerator:
         tags:
-            - { name: lag_admin.slug_generator, generator: default}
+            - {name: lag_admin.slug_generator, generator: default}
 
     # Mapping
     LAG\AdminBundle\Slug\Mapping\SlugMappingInterface: '@LAG\AdminBundle\Slug\Mapping\SlugMapping'

diff --git a/config/services/state.yaml b/config/services/state.yaml
@@ -1,18 +1,22 @@
 services:
-    lag_admin.state.data_provider: '@LAG\AdminBundle\State\DataProviderInterface'
-    LAG\AdminBundle\State\DataProviderInterface:
-        class: LAG\AdminBundle\State\CompositeDataProvider
+    lag_admin.state.data_provider: '@LAG\AdminBundle\State\Provider\DataProviderInterface'
+    lag_admin.state.data_processor: '@LAG\AdminBundle\State\Processor\DataProcessorInterface'
+
+    # Data providers
+    LAG\AdminBundle\State\Provider\DataProviderInterface:
+        class: LAG\AdminBundle\State\Provider\CompositeDataProvider
         arguments:
             $providers: !tagged_iterator lag_admin.data_provider
 
-    lag_admin.state.data_processor: '@LAG\AdminBundle\State\DataProcessorInterface'
-    LAG\AdminBundle\State\DataProcessorInterface:
-        class: LAG\AdminBundle\State\CompositeDataProcessor
+    LAG\AdminBundle\State\Provider\JsonDataProviderDecorator:
+        decorates: lag_admin.state.data_provider
         arguments:
-            $processors: !tagged_iterator lag_admin.data_processor
+            $decorated: '@.inner'
+            $serializer: '@serializer'
 
-    LAG\AdminBundle\State\EventDataProcessor:
-        decorates: 'lag_admin.state.data_processor'
+    # Data processors
+    LAG\AdminBundle\State\Processor\DataProcessorInterface:
+        class: LAG\AdminBundle\State\Processor\CompositeDataProcessor
         arguments:
-            $decorated: '@.inner'
-            $eventDispatcher: '@event_dispatcher'
+            $processors: !tagged_iterator lag_admin.data_processor
+            $eventDispatcher: '@lag_admin.resource.dispatcher'
diff --git a/public/admin.css b/public/admin.css
diff --git a/public/admin.js b/public/admin.js
diff --git a/src/Bridge/Doctrine/ORM/Metadata/MetadataPropertyFactory.php b/src/Bridge/Doctrine/ORM/Metadata/MetadataPropertyFactory.php
@@ -5,9 +5,11 @@
 namespace LAG\AdminBundle\Bridge\Doctrine\ORM\Metadata;
 
 use LAG\AdminBundle\Metadata\Property\Boolean;
+use LAG\AdminBundle\Metadata\Property\Collection;
 use LAG\AdminBundle\Metadata\Property\Count;
 use LAG\AdminBundle\Metadata\Property\Date;
 use LAG\AdminBundle\Metadata\Property\Text;
+use function Symfony\Component\String\u;
 
 class MetadataPropertyFactory implements MetadataPropertyFactoryInterface
 {
@@ -32,6 +34,8 @@ public function createProperties(string $resourceClass): array
                 $properties[$fieldName] = new Date($fieldName);
             } elseif ($fieldType === 'boolean') {
                 $properties[$fieldName] = new Boolean($fieldName);
+            } elseif (u($fieldType)->containsAny(['array', 'json'])) {
+                $properties[$fieldName] = new Collection($fieldName);
             } else {
                 $properties[$fieldName] = new Text($fieldName);
             }

diff --git a/src/Bridge/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php b/src/Bridge/Doctrine/ORM/QueryBuilder/QueryBuilderHelper.php
@@ -37,7 +37,19 @@ public function addOrderBy(array $orderBy): self
                 }
             } else {
                 if ($this->metadata->hasField($propertyPath->toString())) {
-                    $this->queryBuilder->addOrderBy($propertyPath->prepend($this->rootAlias.'.')->toString(), $order);
+                    $this->queryBuilder->addOrderBy(
+                        $propertyPath->prepend($this->rootAlias . '.')->toString(),
+                        $order
+                    );
+                }
+
+                if ($this->metadata->isSingleValuedAssociation($propertyPath->toString())) {
+                    $joinProperty = $propertyPath->prepend('.')->prepend($this->rootAlias)->toString();
+
+                    if (!$this->hasJoin($propertyPath->toString())) {
+                        $this->queryBuilder->innerJoin($joinProperty, $propertyPath->toString());
+                    }
+                    // TODO wip order by join
                 }
             }
         }
@@ -139,7 +151,7 @@ private function hasJoin(string $joinAlias): bool
     {
         $dqlPart = $this->queryBuilder->getDQLPart('join');
 
-        foreach ($dqlPart as $rootAlias => $joins) {
+        foreach ($dqlPart as $joins) {
             /** @var Join $join */
             foreach ($joins as $join) {
                 if ($join->getAlias() === $joinAlias.'_resource') {

diff --git a/src/Bridge/Doctrine/ORM/State/ORMDataProcessor.php b/src/Bridge/Doctrine/ORM/State/ORMDataProcessor.php
@@ -9,7 +9,7 @@
 use LAG\AdminBundle\Metadata\Delete;
 use LAG\AdminBundle\Metadata\OperationInterface;
 use LAG\AdminBundle\Metadata\Update;
-use LAG\AdminBundle\State\DataProcessorInterface;
+use LAG\AdminBundle\State\Processor\DataProcessorInterface;
 
 class ORMDataProcessor implements DataProcessorInterface
 {