fixes

alchemy-fr · Sep 23, 2024 · ce1f0ec · ce1f0ec
1 parent a5204cc
commit ce1f0ec
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 4 deletions.
diff --git a/databox/api/src/Api/OutputTransformer/AssetRenditionOutputTransformer.php b/databox/api/src/Api/OutputTransformer/AssetRenditionOutputTransformer.php
@@ -30,6 +30,7 @@ public function supports(string $outputClass, object $data): bool
     public function transform($data, string $outputClass, array &$context = []): object
     {
         $output = new AssetRenditionOutput();
+        $output->setId($data->getId());
         $output->setCreatedAt($data->getCreatedAt());
         $output->setUpdatedAt($data->getUpdatedAt());
 

diff --git a/databox/client/src/api/integrations.ts b/databox/client/src/api/integrations.ts
@@ -27,7 +27,7 @@ export async function getIntegrationsOfContext(
     const res = await apiClient.get(integrationNS, {
         params: {
             context,
-            workspaceId,
+            workspace: workspaceId,
             ...data,
         },
     });

diff --git a/databox/client/src/components/Media/Asset/Widgets/AssetTagList.tsx b/databox/client/src/components/Media/Asset/Widgets/AssetTagList.tsx
@@ -29,8 +29,8 @@ export default function AssetTagList({tags}: Props) {
     const rest = tags.length - (tagsLimit - 1);
     const others =
         tagsLimit > 1
-            ? t('asset.tag_list.others', `+ {{total}} others`, {total: rest})
-            : t('asset.tag_list.tags', `+ {{total}} tag`, {total: rest});
+            ? t('asset.tag_list.others', `+ {{count}} others`, {count: rest})
+            : t('asset.tag_list.tags', `+ {{count}} tag`, {count: rest});
     const chips =
         tags.length <= tagsLimit
             ? tags.slice(0, tagsLimit).map(r)

diff --git a/lib/php/workflow/src/State/Repository/DoctrineStateRepository.php b/lib/php/workflow/src/State/Repository/DoctrineStateRepository.php
@@ -74,6 +74,10 @@ public function removeJobState(string $workflowId, string $jobId): void
         }
     }
 
+    public function resetJobState(string $workflowId, string $jobId): void
+    {
+    }
+
     public function acquireJobLock(string $workflowId, string $jobId): void
     {
         $this->em->beginTransaction();
@@ -87,6 +91,8 @@ public function acquireJobLock(string $workflowId, string $jobId): void
                     'w' => $workflowId,
                     'j' => $jobId,
                 ])
+                ->addOrderBy('t.createdAt', 'DESC')
+                ->setMaxResults(1)
                 ->getQuery()
                 ->setLockMode(LockMode::PESSIMISTIC_WRITE)
                 ->getOneOrNullResult();

diff --git a/lib/php/workflow/src/State/Repository/FileSystemStateRepository.php b/lib/php/workflow/src/State/Repository/FileSystemStateRepository.php
@@ -131,6 +131,11 @@ public function removeJobState(string $workflowId, string $jobId): void
         }
     }
 
+    public function resetJobState(string $workflowId, string $jobId): void
+    {
+        $this->removeJobState($workflowId, $jobId);
+    }
+
     private function getWorkflowPath(string $id, string $filename): string
     {
         return $this->path.DIRECTORY_SEPARATOR.$id.DIRECTORY_SEPARATOR.$filename.'.state';

diff --git a/lib/php/workflow/src/State/Repository/MemoryStateRepository.php b/lib/php/workflow/src/State/Repository/MemoryStateRepository.php
@@ -55,6 +55,11 @@ public function removeJobState(string $workflowId, string $jobId): void
         unset($this->jobs[$workflowId][$jobId]);
     }
 
+    public function resetJobState(string $workflowId, string $jobId): void
+    {
+        $this->removeJobState($workflowId, $jobId);
+    }
+
     private function ensureWorkflowExists(string $workflowId): void
     {
         if (!isset($this->jobs[$workflowId])) {

diff --git a/lib/php/workflow/src/State/Repository/StateRepositoryInterface.php b/lib/php/workflow/src/State/Repository/StateRepositoryInterface.php
@@ -21,4 +21,6 @@ public function getJobState(string $workflowId, string $jobId): ?JobState;
     public function persistJobState(JobState $state): void;
 
     public function removeJobState(string $workflowId, string $jobId): void;
+
+    public function resetJobState(string $workflowId, string $jobId): void;
 }
diff --git a/lib/php/workflow/src/WorkflowOrchestrator.php b/lib/php/workflow/src/WorkflowOrchestrator.php
@@ -197,7 +197,7 @@ public function rerunJobs(string $workflowId, ?string $jobIdFilter = null, ?arra
                 try {
                     $jobState = $this->stateRepository->getJobState($workflowId, $jobId);
                     if (null !== $jobState && (null === $expectedStatuses || in_array($jobState->getStatus(), $expectedStatuses, true))) {
-                        $this->stateRepository->removeJobState($workflowId, $jobId);
+                        $this->stateRepository->resetJobState($workflowId, $jobId);
 
                         if (!$run->getJob()->isDisabled()) {
                             $jobsToTrigger[] = $jobId;