Fix assets not loaded for fields generated automatically

javiereguiluz · javiereguiluz · commit 29775b9b21b8 · 2024-07-10T20:58:23.000+02:00
diff --git a/src/Collection/EntityCollection.php b/src/Collection/EntityCollection.php
@@ -35,6 +35,11 @@ public function set(EntityDto $newOrUpdatedEntity): void
         $this->entities[$newOrUpdatedEntity->getPrimaryKeyValueAsString()] = $newOrUpdatedEntity;
     }
 
+    public function first(): ?EntityDto
+    {
+        return $this->entities[array_key_first($this->entities)] ?? null;
+    }
+
     public function offsetExists(mixed $offset): bool
     {
         return \array_key_exists($offset, $this->entities);
diff --git a/src/Controller/AbstractCrudController.php b/src/Controller/AbstractCrudController.php
@@ -127,7 +127,6 @@ public function index(AdminContext $context)
         }
 
         $fields = FieldCollection::new($this->configureFields(Crud::PAGE_INDEX));
-        $context->getCrud()->setFieldAssets($this->getFieldAssets($fields));
         $filters = $this->container->get(FilterFactory::class)->create($context->getCrud()->getFiltersConfig(), $fields, $context->getEntity());
         $queryBuilder = $this->createIndexQueryBuilder($context->getSearch(), $context->getEntity(), $fields, $filters);
         $paginator = $this->container->get(PaginatorFactory::class)->create($queryBuilder);
@@ -142,6 +141,8 @@ public function index(AdminContext $context)
 
         $entities = $this->container->get(EntityFactory::class)->createCollection($context->getEntity(), $paginator->getResults());
         $this->container->get(EntityFactory::class)->processFieldsForAll($entities, $fields);
+        $procesedFields = $entities->first()?->getFields() ?? FieldCollection::new([]);
+        $context->getCrud()->setFieldAssets($this->getFieldAssets($procesedFields));
         $actions = $this->container->get(EntityFactory::class)->processActionsForAll($entities, $context->getCrud()->getActionsConfig());
 
         $responseParameters = $this->configureResponseParameters(KeyValueStore::new([
diff --git a/src/Orm/EntityRepository.php b/src/Orm/EntityRepository.php
@@ -262,7 +262,7 @@ private function getSearchablePropertiesConfig(QueryBuilder $queryBuilder, Searc
                 $associatedEntityAlias = $associatedPropertyName = '';
                 for ($i = 0; $i < $numAssociatedProperties - 1; ++$i) {
                     $associatedEntityName = $associatedProperties[$i];
-                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName).($i ?: '');
+                    $associatedEntityAlias = Escaper::escapeDqlAlias($associatedEntityName).((string) $i);
                     $associatedPropertyName = $associatedProperties[$i + 1];
 
                     if (!\in_array($associatedEntityAlias, $entitiesAlreadyJoined, true)) {

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,11 @@ public function set(EntityDto $newOrUpdatedEntity): void`
`35`	`35`	`$this->entities[$newOrUpdatedEntity->getPrimaryKeyValueAsString()] = $newOrUpdatedEntity;`
`36`	`36`	`}`
`37`	`37`
	`38`	`+ public function first(): ?EntityDto`
	`39`	`+ {`
	`40`	`+ return $this->entities[array_key_first($this->entities)] ?? null;`
	`41`	`+ }`
	`42`	`+`
`38`	`43`	`public function offsetExists(mixed $offset): bool`
`39`	`44`	`{`
`40`	`45`	`return \array_key_exists($offset, $this->entities);`