PS-721 fix un/translatable behaviour on attrs

configurator/src/Configurator/Vendor/Keycloak/KeycloakConfigurator.php

@@ -70,12 +70,18 @@ public function configure(OutputInterface $output, array $presets): void
         $appScopes = $this->getAppScopes();
         foreach ($this->symfonyApplications as $app) {
             $clientId = getenv(sprintf('%s_ADMIN_CLIENT_ID', strtoupper($app)));
+            $baseUri = getenv(sprintf('%s_API_URL', strtoupper($app)));
+
             $clientData = $this->configureClient(
                 $clientId,
                 getenv(sprintf('%s_ADMIN_CLIENT_SECRET', strtoupper($app))),
-                getenv(sprintf('%s_API_URL', strtoupper($app))).'/admin',
+                $baseUri,
                 [
                     'serviceAccountsEnabled' => true,
+                ],
+                redirectUris: [
+                    $baseUri.'/admin/*',
+                    $baseUri.'/bundles/apiplatform/swagger-ui/oauth2-redirect.html',
                 ]
             );
 
@@ -198,12 +204,14 @@ private function configureClient(
         ?string $clientSecret,
         string $baseUri,
         array $data = [],
+        ?array $redirectUris = null,
     ): array {
         $clientData = $this->keycloakManager->createClient(
             $clientId,
             $clientSecret,
             $baseUri,
             $data,
+            $redirectUris,
         );
 
         foreach ([

configurator/src/Configurator/Vendor/Keycloak/KeycloakManager.php

@@ -274,8 +274,9 @@ public function addServiceAccountRole(
     public function createClient(
         string $clientId,
         ?string $clientSecret,
-        ?string $baseUri,
+        ?string $rootUrl,
         array $data = [],
+        ?array $redirectUris = null,
     ): array {
         $client = $this->getClientByClientId($clientId);
 
@@ -284,10 +285,10 @@ public function createClient(
             'secret' => $clientSecret,
             'publicClient' => null === $clientSecret,
             'frontchannelLogout' => false,
-            'rootUrl' => $baseUri,
-            'redirectUris' => $baseUri ? [
-                $baseUri.'/*',
-            ] : null,
+            'rootUrl' => $rootUrl,
+            'redirectUris' => $redirectUris ?? ($rootUrl ? [
+                $rootUrl.'/*',
+            ] : null),
         ], $data);
 
         if (null !== $client) {

databox/api/config/packages/api_platform.yaml

@@ -18,7 +18,7 @@ api_platform:
     oauth:
         clientId: '%env(ADMIN_CLIENT_ID)%'
         clientSecret: '%env(ADMIN_CLIENT_SECRET)%'
-        tokenUrl: '%env(KEYCLOAK_URL)%/oauth/v2/token'
+        tokenUrl: '%env(KEYCLOAK_URL)%/realms/%env(KEYCLOAK_REALM_NAME)%/protocol/openid-connect/token'
+        authorizationUrl: '%env(KEYCLOAK_URL)%/realms/%env(KEYCLOAK_REALM_NAME)%/protocol/openid-connect/auth'
         flow: authorizationCode
-        authorizationUrl: '%env(KEYCLOAK_URL)%/oauth/v2/auth'
     event_listeners_backward_compatibility_layer: false

databox/api/src/Api/Model/Input/AssetInput.php

@@ -30,6 +30,7 @@ class AssetInput extends AbstractOwnerIdInput
     /**
      * @var Workspace
      */
+    #[Assert\NotNull]
     public $workspace;
 
     public ?Collection $collection = null;

databox/api/src/Api/Model/Output/ESDocumentStateOutput.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Api\Model\Output;
+
+use Symfony\Component\Serializer\Annotation\Groups;
+
+final readonly class ESDocumentStateOutput
+{
+    public function __construct(
+        #[Groups(['_'])]
+        private array $data,
+        #[Groups(['_'])]
+        private bool $synced,
+    )
+    {
+    }
+
+    public function getData(): array
+    {
+        return $this->data;
+    }
+
+    public function getSynced(): bool
+    {
+        return $this->synced;
+    }
+}

databox/api/src/Api/Processor/AssetAttributeBatchUpdateProcessor.php

@@ -42,6 +42,8 @@ public function process($data, Operation $operation, array $uriVariables = [], a
             true,
         );
 
+        $this->em->clear();
+
         return $asset;
     }
 }

databox/api/src/Api/Processor/ItemElasticsearchDocumentSyncProcessor.php

@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Api\Processor;
+
+use Alchemy\AuthBundle\Security\JwtUser;
+use Alchemy\AuthBundle\Security\Traits\SecurityAwareTrait;
+use Alchemy\ESBundle\Listener\DeferredIndexListener;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProcessorInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+class ItemElasticsearchDocumentSyncProcessor implements ProcessorInterface
+{
+    use SecurityAwareTrait;
+
+    public function __construct(
+        private readonly DeferredIndexListener $deferredIndexListener,
+    ) {
+    }
+
+    public function process($data, Operation $operation, array $uriVariables = [], array $context = []): Response
+    {
+        $this->denyAccessUnlessGranted(JwtUser::ROLE_TECH);
+        $this->deferredIndexListener->scheduleForUpdate($data);
+
+        return new Response('', 201);
+    }
+}

databox/api/src/Api/Provider/AttributeCollectionProvider.php

@@ -13,12 +13,8 @@ protected function provideCollection(Operation $operation, array $uriVariables =
     {
         $asset = $this->getAsset($context);
 
-        $criteria = [
-            'asset' => $asset->getId(),
-        ];
-
-        return $this->em->getRepository(Attribute::class)->findBy($criteria, [
-            'position' => 'ASC',
-        ]);
+        return $this->em->getRepository(Attribute::class)
+            ->getAssetAttributes($asset->getId())
+        ;
     }
 }

databox/api/src/Api/Provider/FieldTypeProvider.php

@@ -30,7 +30,7 @@ protected function provideCollection(
             $t->setName($name);
 
             return $t;
-        }, $this->attributeTypeRegistry->getTypes());
+        }, array_filter($this->attributeTypeRegistry->getTypes(), fn (AttributeTypeInterface $type): bool => $type->isListed()));
 
         usort($results, fn (FieldType $a, FieldType $b): int => $a->getTitle() <=> $b->getTitle());
 

databox/api/src/Api/Provider/ItemElasticsearchDocumentProvider.php

@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Api\Provider;
+
+use Alchemy\AuthBundle\Security\JwtUser;
+use Alchemy\AuthBundle\Security\Traits\SecurityAwareTrait;
+use ApiPlatform\Metadata\Operation;
+use ApiPlatform\State\ProviderInterface;
+use App\Api\Traits\ItemProviderAwareTrait;
+use App\Elasticsearch\ESDocumentStateManager;
+use App\Security\Voter\AbstractVoter;
+use Doctrine\ORM\EntityManagerInterface;
+
+final class ItemElasticsearchDocumentProvider implements ProviderInterface
+{
+    use SecurityAwareTrait;
+    use ItemProviderAwareTrait;
+
+    public function __construct(
+        private readonly EntityManagerInterface $em,
+        private readonly ESDocumentStateManager $esDocumentStateManager,
+    ) {
+    }
+
+    public function provide(Operation $operation, array $uriVariables = [], array $context = []): object|array|null
+    {
+        $item = $this->itemProvider->provide($operation, $uriVariables, $context);
+        $this->denyAccessUnlessGranted(AbstractVoter::READ, $item);
+        $this->denyAccessUnlessGranted(JwtUser::ROLE_TECH);
+
+        if ($item) {
+            return $this->esDocumentStateManager->getObjectState($item);
+        }
+
+        return null;
+    }
+}

databox/api/src/Attribute/Type/AbstractAttributeType.php

@@ -114,4 +114,9 @@ public function supportsElasticSearchFuzziness(): bool
     {
         return false;
     }
+
+    public function isListed(): bool
+    {
+        return true;
+    }
 }

databox/api/src/Attribute/Type/AttributeTypeInterface.php

@@ -70,4 +70,6 @@ public function validate($value, ExecutionContextInterface $context): void;
     public function getAggregationField(): ?string;
 
     public function normalizeBucket(array $bucket): ?array;
+
+    public function isListed(): bool;
 }

databox/api/src/Attribute/Type/CollectionPathAttributeType.php

@@ -79,4 +79,9 @@ public function supportsAggregation(): bool
     {
         return true;
     }
+
+    public function isListed(): bool
+    {
+        return false;
+    }
 }

databox/api/src/Consumer/Handler/File/FileDelete.php → databox/api/src/Consumer/Handler/File/DeleteFileFromStorage.php

@@ -5,7 +5,7 @@
 use Alchemy\MessengerBundle\Attribute\MessengerMessage;
 
 #[MessengerMessage('p2')]
-final readonly class FileDelete
+final readonly class DeleteFileFromStorage
 {
     public function __construct(
         private array $paths,

databox/api/src/Consumer/Handler/File/FileDeleteHandler.php → databox/api/src/Consumer/Handler/File/DeleteFileFromStorageHandler.php

@@ -8,14 +8,14 @@
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
 #[AsMessageHandler]
-readonly class FileDeleteHandler
+readonly class DeleteFileFromStorageHandler
 {
     public function __construct(
         private FileStorageManager $storageManager,
     ) {
     }
 
-    public function __invoke(FileDelete $message): void
+    public function __invoke(DeleteFileFromStorage $message): void
     {
         foreach ($message->getPaths() as $path) {
             $this->storageManager->delete($path);

databox/api/src/Consumer/Handler/File/DeleteFilesIfOrphan.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Consumer\Handler\File;
+
+use Alchemy\MessengerBundle\Attribute\MessengerMessage;
+
+#[MessengerMessage('p2')]
+final readonly class DeleteFilesIfOrphan
+{
+    public function __construct(
+        private array $ids,
+    ) {
+    }
+
+    public function getIds(): array
+    {
+        return $this->ids;
+    }
+}

databox/api/src/Consumer/Handler/File/DeleteFilesIfOrphanHandler.php

@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Consumer\Handler\File;
+
+use App\Entity\Core\File;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+#[AsMessageHandler]
+readonly class DeleteFilesIfOrphanHandler
+{
+    public function __construct(
+        private EntityManagerInterface $em,
+        private MessageBusInterface $bus,
+    ) {
+    }
+
+    public function __invoke(DeleteFilesIfOrphan $message): void
+    {
+        $repo = $this->em->getRepository(File::class);
+        foreach ($message->getIds() as $id) {
+            $this->em->wrapInTransaction(function () use ($id, $repo): void {
+                $file = $repo->find($id);
+                if ($file instanceof File) {
+                    $path = null;
+                    if (File::STORAGE_S3_MAIN === $file->getStorage()) {
+                        $path = $file->getPath();
+                    }
+
+                    $this->em->remove($file);
+                    $this->em->flush();
+
+                    if (null !== $path) {
+                        $this->bus->dispatch(new DeleteFileFromStorage([$path]));
+                    }
+                }
+            });
+        }
+    }
+}

databox/api/src/Controller/Admin/AlternateUrlCrudController.php

@@ -23,8 +23,8 @@ public static function getEntityFqcn(): string
     public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
-            ->setEntityLabelInSingular('AlternateUrl')
-            ->setEntityLabelInPlural('AlternateUrl')
+            ->setEntityLabelInSingular('Alternate URL')
+            ->setEntityLabelInPlural('Alternate URLs')
             ->setSearchFields(['id', 'type', 'label']);
     }
 

databox/api/src/Controller/Admin/AssetCrudController.php

@@ -75,9 +75,8 @@ public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
             ->setEntityLabelInSingular('Asset')
-            ->setEntityLabelInPlural('Asset')
-            ->setSearchFields(['id', 'title', 'ownerId', 'key', 'locale', 'privacy'])
-            ->setPaginatorPageSize(30);
+            ->setEntityLabelInPlural('Assets')
+            ->setSearchFields(['id', 'title', 'ownerId', 'key', 'locale', 'privacy']);
     }
 
     public function configureFilters(Filters $filters): Filters

databox/api/src/Controller/Admin/AssetRenditionCrudController.php

@@ -40,8 +40,8 @@ public function configureActions(Actions $actions): Actions
     public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
-            ->setEntityLabelInSingular('AssetRendition')
-            ->setEntityLabelInPlural('AssetRendition')
+            ->setEntityLabelInSingular('Asset Rendition')
+            ->setEntityLabelInPlural('Asset Renditions')
             ->setSearchFields(['id', 'definition.name'])
             ->setPaginatorPageSize(100);
     }

databox/api/src/Controller/Admin/AssetTitleAttributeCrudController.php

@@ -23,8 +23,8 @@ public static function getEntityFqcn(): string
     public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
-            ->setEntityLabelInSingular('AssetTitleAttribute')
-            ->setEntityLabelInPlural('AssetTitleAttribute')
+            ->setEntityLabelInSingular('Asset Title Attribute')
+            ->setEntityLabelInPlural('Asset Title Attributes')
             ->setSearchFields(['id', 'priority'])
             ->setPaginatorPageSize(200);
     }

databox/api/src/Controller/Admin/AttributeClassCrudController.php

@@ -27,8 +27,8 @@ public static function getEntityFqcn(): string
     public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
-            ->setEntityLabelInSingular('AttributeClass')
-            ->setEntityLabelInPlural('AttributeClass')
+            ->setEntityLabelInSingular('Attribute Class')
+            ->setEntityLabelInPlural('Attribute Classes')
             ->setSearchFields(['id', 'name', 'key'])
             ->setPaginatorPageSize(100);
     }

databox/api/src/Controller/Admin/AttributeCrudController.php

@@ -59,9 +59,9 @@ public function configureCrud(Crud $crud): Crud
     {
         return parent::configureCrud($crud)
             ->setEntityLabelInSingular('Attribute')
-            ->setEntityLabelInPlural('Attribute')
+            ->setEntityLabelInPlural('Attributes')
             ->setSearchFields(['id', 'locale', 'position', 'value', 'origin', 'originVendor', 'originUserId', 'originVendorContext', 'status', 'confidence'])
-            ->setPaginatorPageSize(20);
+        ;
     }
 
     public function configureFields(string $pageName): iterable