From 3f82d0967a26ddfbae979f20c01a63db2cb85d6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20B=C3=B6hmer?= <jan.h.boehmer@gmx.de>
Date: Thu, 29 Dec 2022 13:15:26 +0100
Subject: [PATCH] Allow to add a part to a project from a parts info page

---
 src/Controller/ProjectController.php     | 29 ++++++++++++++++++------
 templates/Parts/info/_projects.html.twig |  9 ++++++--
 templates/Parts/info/_tools.html.twig    |  8 ++++++-
 translations/messages.en.xlf             |  6 +++++
 4 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php
index ea740166..9b93c8ec 100644
--- a/src/Controller/ProjectController.php
+++ b/src/Controller/ProjectController.php
@@ -29,11 +29,13 @@ use App\Form\Type\StructuralEntityType;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\ORM\EntityManagerInterface;
 use Omines\DataTablesBundle\DataTableFactory;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Validator\Constraints\NotNull;
 
 /**
  * @Route("/project")
@@ -48,7 +50,7 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @Route("/{id}", name="project_info")
+     * @Route("/{id}", name="project_info", requirements={"id"="\d+"})
      */
     public function info(Project $project, Request $request)
     {
@@ -68,20 +70,28 @@ class ProjectController extends AbstractController
     }
 
     /**
-     * @Route("/{id}/add_parts", name="project_add_parts")
+     * @Route("/add_parts", name="project_add_parts_no_id")
+     * @Route("/{id}/add_parts", name="project_add_parts", requirements={"id"="\d+"})
      * @param  Request  $request
      * @param  Project|null  $project
      */
-    public function addPart(Request $request, Project $project, EntityManagerInterface $entityManager): Response
+    public function addPart(Request $request, EntityManagerInterface $entityManager, ?Project $project): Response
     {
-        $this->denyAccessUnlessGranted('edit', $project);
+        if($project) {
+            $this->denyAccessUnlessGranted('edit', $project);
+        } else {
+            $this->denyAccessUnlessGranted('@devices.edit');
+        }
 
         $builder = $this->createFormBuilder();
         $builder->add('project', StructuralEntityType::class, [
             'class' => Project::class,
             'required' => true,
-            'disabled' => true,
+            'disabled' => $project !== null, //If a project is given, disable the field
             'data' => $project,
+            'constraints' => [
+                new NotNull()
+            ]
         ]);
         $builder->add('bom_entries', ProjectBOMEntryCollectionType::class);
         $builder->add('submit', SubmitType::class, ['label' => 'save']);
@@ -111,10 +121,15 @@ class ProjectController extends AbstractController
 
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
+            $target_project = $project ?? $form->get('project')->getData();
+
+            //Ensure that we really have acces to the selected project
+            $this->denyAccessUnlessGranted('edit', $target_project);
+
             $data = $form->getData();
             $bom_entries = $data['bom_entries'];
             foreach ($bom_entries as $bom_entry){
-                $project->addBOMEntry($bom_entry);
+                $target_project->addBOMEntry($bom_entry);
             }
             $entityManager->flush();
 
@@ -123,7 +138,7 @@ class ProjectController extends AbstractController
                 return $this->redirect($request->query->get('_redirect'));
             }
             //Otherwise just show the project info page
-            return $this->redirectToRoute('project_info', ['id' => $project->getID()]);
+            return $this->redirectToRoute('project_info', ['id' => $target_project->getID()]);
         }
 
         return $this->renderForm('Projects/add_parts.html.twig', [
diff --git a/templates/Parts/info/_projects.html.twig b/templates/Parts/info/_projects.html.twig
index 274de3f0..e9d58c6e 100644
--- a/templates/Parts/info/_projects.html.twig
+++ b/templates/Parts/info/_projects.html.twig
@@ -25,6 +25,11 @@
             {% endfor %}</td>
     </tr>
     {% endfor %}
-
     </tbody>
-</table>
\ No newline at end of file
+</table>
+
+<a class="btn btn-success" {% if not is_granted('@devices.edit') %}disabled{% endif %}
+   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": app.request.requestUri}) }}">
+    <i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
+    {% trans %}part.info.add_part_to_project{% endtrans %}
+</a>
\ No newline at end of file
diff --git a/templates/Parts/info/_tools.html.twig b/templates/Parts/info/_tools.html.twig
index 5f73b056..b9d7e0d4 100644
--- a/templates/Parts/info/_tools.html.twig
+++ b/templates/Parts/info/_tools.html.twig
@@ -51,4 +51,10 @@
     </div>
 </form>
 
-{{ dropdown.profile_dropdown('part', part.id) }}
\ No newline at end of file
+{{ dropdown.profile_dropdown('part', part.id) }}
+
+<a class="btn btn-success mt-2" {% if not is_granted('@devices.edit') %}disabled{% endif %}
+   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect": app.request.requestUri}) }}">
+    <i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
+    {% trans %}part.info.add_part_to_project{% endtrans %}
+</a>
\ No newline at end of file
diff --git a/translations/messages.en.xlf b/translations/messages.en.xlf
index 507ca9da..128690d0 100644
--- a/translations/messages.en.xlf
+++ b/translations/messages.en.xlf
@@ -10007,5 +10007,11 @@ Element 3</target>
         <target>Add parts to project BOM</target>
       </segment>
     </unit>
+    <unit id="02xC690" name="part.info.add_part_to_project">
+      <segment>
+        <source>part.info.add_part_to_project</source>
+        <target>Add this part to a project</target>
+      </segment>
+    </unit>
   </file>
 </xliff>