Merge pull request #74 from vmalyk/hotfix/missed-translator-in-contro…

…ller Added and fixed controller for getting translations
YouweGit · Jul 22, 2024 · 7720f1c · 7720f1c
2 parents 64ce8d3 + d9aae6a
commit 7720f1c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/src/WorkflowGui/Controller/WorkflowController.php b/src/WorkflowGui/Controller/WorkflowController.php
@@ -18,6 +18,7 @@
 
 use Pimcore\Bundle\CoreBundle\DependencyInjection\Configuration;
 use Pimcore\Cache\Symfony\CacheClearer;
+use Symfony\Contracts\Translation\TranslatorInterface;
 use Pimcore\Controller\Traits\JsonHelperTrait;
 use Pimcore\Controller\UserAwareController;
 use Pimcore\Model\User;
@@ -42,6 +43,7 @@ public function __construct(
         protected ConfigFileResolverInterface $configFileResolver,
         protected KernelInterface $kernel,
         protected CacheClearer $cacheClearer,
+        protected TranslatorInterface $translator
     ) {}
 
     public function listAction(): JsonResponse
@@ -91,7 +93,7 @@ public function cloneAction(Request $request): JsonResponse
         if ($workflowByName) {
             return $this->json([
                 'success' => false,
-                'message' => $this->trans('workflow_gui_workflow_with_name_already_exists'),
+                'message' => $this->translator->trans('workflow_gui_workflow_with_name_already_exists'),
             ]);
         }
 
@@ -283,12 +285,12 @@ public function visualizeAction(Request $request): Response
         $this->isGrantedOr403();
 
         try {
-            return new Response($this->container->get('twig')->render(
+            return $this->render(
                 '@WorkflowGui/Workflow/visualize.html.twig',
                 [
                     'image' => $this->getVisualization($request->get('workflow'), 'svg'),
                 ]
-            ));
+            );
         } catch (\Throwable $e) {
             return new Response($e->getMessage());
         }
@@ -325,21 +327,21 @@ private function getVisualization($workflow, $format): string
         $dot = Console::getExecutable('dot');
 
         if (!$php) {
-            throw new \InvalidArgumentException($this->trans('workflow_cmd_not_found', ['php']));
+            throw new \InvalidArgumentException($this->translator->trans('workflow_cmd_not_found', ['php'], 'admin'));
         }
 
         if (!$dot) {
-            throw new \InvalidArgumentException($this->trans('workflow_cmd_not_found', ['dot']));
+            throw new \InvalidArgumentException($this->translator->trans('workflow_cmd_not_found', ['dot'], 'admin'));
         }
 
         $workflowRepository = $this->repository->find($workflow);
 
         if ($workflowRepository === null) {
-            throw new \InvalidArgumentException($this->trans('workflow_gui_not_found'));
+            throw new \InvalidArgumentException($this->translator->trans('workflow_gui_not_found', [], 'admin'));
         }
 
         if (!$workflowRepository['enabled'] ?? false) {
-            throw new \InvalidArgumentException($this->trans('workflow_gui_enable_message'));
+            throw new \InvalidArgumentException($this->translator->trans('workflow_gui_enable_message', [], 'admin'));
         }
 
         $cmd = $php.' '.PIMCORE_PROJECT_ROOT.'/bin/console --env="${:arg_environment}" pimcore:workflow:dump "${:arg_workflow}" | '.$dot.' -T"${:arg_format}"';

diff --git a/src/WorkflowGui/Resources/config/services.yml b/src/WorkflowGui/Resources/config/services.yml
@@ -11,14 +11,14 @@ services:
             - '@Youwe\Pimcore\WorkflowGui\Resolver\ConfigFileResolver'
 
     Youwe\Pimcore\WorkflowGui\Controller\WorkflowController:
-        arguments:
+       arguments:
             - '@Youwe\Pimcore\WorkflowGui\Repository\WorkflowRepository'
             - '@Youwe\Pimcore\WorkflowGui\Resolver\ConfigFileResolver'
             - '@kernel'
             - '@Pimcore\Cache\Symfony\CacheClearer'
-        tags:
-            - { name: controller.service_arguments }
-        calls:
-            - { method: setContainer, arguments: [ '@service_container' ] }
+            - '@translator'
+       tags: ['controller.service_arguments', 'container.service_subscriber']
+       calls:
+            - { method: setContainer, arguments: [ '@Psr\Container\ContainerInterface' ] }
             - { method: setTokenResolver, arguments: [ '@Pimcore\Security\User\TokenStorageUserResolver' ] }
             - { method: setPimcoreSerializer, arguments: [ '@pimcore.serializer' ] }