Merge pull request #32 from itk-dev/feature/3644-fixes

rimi-itk · web-flow · commit 33e452a2d68c · 2025-04-04T12:43:52.000+02:00
3644: Cleaned up template and controller
diff --git a/.editorconfig b/.editorconfig
@@ -0,0 +1,15 @@
+# EditorConfig is awesome: https://editorconfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+indent_style = space
+indent_size = 4
+
+[*.{css,js,twig}]
+indent_size = 2
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,8 @@ See [keep a changelog] for information about writing changes to this log.
 
 ## [Unreleased]
 
+* [PR-32](https://github.com/itk-dev/sysstatus/pull/32)
+  3644: Cleaned up template and controller
 * [PR-31](https://github.com/itk-dev/sysstatus/pull/31)
   Upgraded to Symfony 7.2
 * [PR-30](https://github.com/itk-dev/sysstatus/pull/30)
diff --git a/assets/styles/app.css b/assets/styles/app.css
@@ -217,3 +217,10 @@ body.list table tbody td.dashboard--table-answer {
         }
     }
 }
+
+/* Don't let fragment links stand out */
+h2 {
+    a {
+        color: inherit;
+    }
+}
diff --git a/composer.json b/composer.json
@@ -29,6 +29,7 @@
         "symfony/validator": "~7.2.4",
         "symfony/yaml": "~7.2.3",
         "twig/extra-bundle": "^2.12 || ^3.20",
+        "twig/string-extra": "^3.20",
         "twig/twig": "^2.12 || ^3.20"
     },
     "require-dev": {
diff --git a/composer.lock b/composer.lock
diff --git a/src/Controller/Admin/AnswerCrudController.php b/src/Controller/Admin/AnswerCrudController.php
@@ -3,43 +3,87 @@
 namespace App\Controller\Admin;
 
 use App\Entity\Answer;
+use App\Entity\Question;
+use App\Entity\System;
 use Doctrine\ORM\EntityManagerInterface;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Action;
 use EasyCorp\Bundle\EasyAdminBundle\Config\Actions;
-use EasyCorp\Bundle\EasyAdminBundle\Config\Crud;
+use EasyCorp\Bundle\EasyAdminBundle\Context\AdminContext;
 use EasyCorp\Bundle\EasyAdminBundle\Controller\AbstractCrudController;
 use EasyCorp\Bundle\EasyAdminBundle\Field\ChoiceField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextareaField;
 use EasyCorp\Bundle\EasyAdminBundle\Field\TextField;
 use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Translation\TranslatableMessage;
 
 class AnswerCrudController extends AbstractCrudController
 {
+    public function __construct(
+        private readonly EntityManagerInterface $entityManager,
+    ) {
+    }
+
     public static function getEntityFqcn(): string
     {
         return Answer::class;
     }
 
     #[\Override]
-    public function updateEntity(EntityManagerInterface $entityManager, mixed $entityInstance): void
+    protected function getRedirectResponseAfterSave(AdminContext $context, string $action): RedirectResponse
     {
-        // TODO: Change the autogenerated stub
-        parent::updateEntity($entityManager, $entityInstance);
+        // Lifted from parent::getRedirectResponseAfterSave().
+        $submitButtonName = $context->getRequest()->request->all()['ea']['newForm']['btn'] ?? null;
+
+        // Answers don't have an index which is where EasyAdmin will return to by default on save.
+        // Therefore we return to somewhere else on save.
+        if (Action::SAVE_AND_RETURN === $submitButtonName) {
+            $request = $context->getRequest();
 
-        $url = $this->generateUrl('dashboard', ['entityType' => 'system']);
-        $response = new RedirectResponse($url);
-        $response->send();
+            // Check if we have a “referer” (sic!) set.
+            if ($referer = $request->get('referer')) {
+                return $this->redirect($referer);
+            }
+            // Check if we have a “system” set.
+            if ($system = $request->get('system')) {
+                return $this->redirectToRoute('admin_system_detail', ['entityId' => $system]);
+            }
+
+            // Use system index as fallback.
+            return $this->redirectToRoute('admin_system_index');
+        }
+
+        return parent::getRedirectResponseAfterSave($context, $action);
+    }
+
+    #[\Override]
+    public function createEntity(string $entityFqcn): Answer
+    {
+        /** @var Answer $entity */
+        $entity = parent::createEntity($entityFqcn);
+
+        // Set system and question on new answers.
+        $params = $this->getContext()->getRequest()->query->all();
+        if (isset($params['system'], $params['question'])) {
+            $system = $this->entityManager->getRepository(System::class)->find($params['system']);
+            $question = $this->entityManager->getRepository(Question::class)->find($params['question']);
+            if ($system && $question) {
+                $entity
+                    ->setSystem($system)
+                    ->setQuestion($question);
+            } else {
+                throw new BadRequestHttpException();
+            }
+        }
+
+        return $entity;
     }
 
     #[\Override]
     public function configureActions(Actions $actions): Actions
     {
         return $actions
-
-            ->add(Crud::PAGE_EDIT, Action::EDIT)
-            ->add(Crud::PAGE_DETAIL, Action::DETAIL)
-            ->disable(Action::NEW, Action::DELETE, Action::INDEX)
-        ;
+            ->disable(Action::SAVE_AND_ADD_ANOTHER, Action::DELETE, Action::INDEX, Action::DETAIL);
     }
 
     /**
@@ -48,20 +92,19 @@ public function configureActions(Actions $actions): Actions
     #[\Override]
     public function configureFields(string $pageName): iterable
     {
-        $question = TextField::new('question')->setFormTypeOptions(['disabled' => true]);
-        $smiley = ChoiceField::new('smiley')->setChoices([
-            'GREEN' => 'GREEN',
-            'RED' => 'RED',
-            'BLUE' => 'BLUE',
-            'YELLOW' => 'YELLOW',
-        ]);
-        $note = TextareaField::new('note');
-        if (Crud::PAGE_EDIT === $pageName) {
-            return [$question, $smiley, $note];
-        } elseif (Crud::PAGE_DETAIL === $pageName) {
-            return [$question, $smiley, $note];
-        } else {
-            throw new \Exception('Invalid page: '.$pageName);
-        }
+        $question = TextField::new('question')
+            ->setFormTypeOptions(['disabled' => true]);
+        yield $question;
+        yield ChoiceField::new('smiley')
+            ->setTranslatableChoices([
+                'GREEN' => new TranslatableMessage('smiley.GREEN'),
+                'RED' => new TranslatableMessage('smiley.RED'),
+                'BLUE' => new TranslatableMessage('smiley.BLUE'),
+                'YELLOW' => new TranslatableMessage('smiley.YELLOW'),
+            ])
+            // We want to use fancy smileys in the options (cf. translations/messages.da.yml).
+            ->escapeHtml(false)
+        ;
+        yield TextareaField::new('note');
     }
 }
diff --git a/templates/easy_admin_overrides/answers_show.html.twig b/templates/easy_admin_overrides/answers_show.html.twig
@@ -1,13 +1,13 @@
 
-{% set itemClass = getclass(entity.instance)|split('\\')|last %}
 {% set alphabet = ['A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z'] %}
-{% set numberOfCategories = 0 %}
+{% set categoryCounter = 0 %}
 
 {% for theme in entity.instance.getAnswerArea %}
   {% for themeCategory in theme.themeCategories|sort_order %}
     {% set category = themeCategory.category %}
-    {% set numberOfCategories = numberOfCategories + 1 %}
-    <h2>{{ category.name }}</h2>
+    {% set categoryCounter = categoryCounter + 1 %}
+      {% set section_id = category.name|slug|lower %}
+      <h2 id="{{ section_id }}"><a href="#{{ section_id }}">{{ category.name }}</a></h2>
     <table class="smiley-table table table-hover">
       <thead>
       <tr>
@@ -17,11 +17,12 @@
         <th>{{ 'answers_show.actions'|trans }}</th>
       </tr>
       </thead>
-      {% set numberOfQuestions = 0 %}
-      {% for question in category.questions|sort_order %}
-        {% set numberOfQuestions = numberOfQuestions + 1 %}
-        <tr>
-          <td>{{ alphabet[numberOfCategories - 1] }}{{ numberOfQuestions }}</td>
+      {% set questionCounter = 0 %}
+      {% for index, question in category.questions|sort_order %}
+        {% set questionCounter = questionCounter + 1 %}
+        {% set question_id = section_id ~ '-' ~ questionCounter %}
+        <tr id="{{ question_id }}">
+          <td>{{ alphabet[categoryCounter - 1] }}{{ questionCounter }}</td>
           <td>
             <a class="" href="{{ ea_url()
               .setController('App\\Controller\\Admin\\AnswerCrudController')
@@ -30,52 +31,48 @@
               {{ question.question }}
             </a>
           </td>
-          {% set numberOfAnswers = 0 %}
 
-          {% for answer in question.answers %}
-            {% if answer in entity.instance.answers %}
-              <td>
-                {{ include('easy_admin_overrides/field_smiley.html.twig', {value: answer.smiley, title: answer.note, width: 25}) }}
-              </td>
-            {% endif %}
-            {% if answer in entity.instance.answers %}
+          {# Get a list of answers within the system #}
+          {% set answers = question.answers|filter(a => a in entity.instance.answers) %}
 
-              {% set numberOfAnswers = numberOfAnswers + 1 %}
-              <td>
-{# <a href="{{ easyadmin_path('Answer', 'edit', { id: answer.id }) }}"> #}
-
-                  <a class="" href="{{ ea_url()
-                    .setController('App\\Controller\\Admin\\AnswerCrudController')
-                    .setAction('edit')
-                    .setEntityId(answer.id)
-                  }}">
+          {% set referer = app.request.pathinfo ~ '#' ~ question_id %}
+          {# @todo The layout will break if ww have more that one answer #}
+          {% for answer in answers %}
+            <td>
+              {{ include('easy_admin_overrides/field_smiley.html.twig', {value: answer.smiley, title: answer.note, width: 25}) }}
+            </td>
 
-                  <i class="fa fa-edit edit-icon"></i> {{ 'answers_show.edit'|trans }}
-                </a>
-              </td>
-            {% endif %}
-          {% endfor %}
-          {% if numberOfAnswers == 0 %}
+            <td>
+              <a href="{{ ea_url({
+                            referer,
+                         })
+                         .setController('App\\Controller\\Admin\\AnswerCrudController')
+                         .setAction('edit')
+                         .setEntityId(answer.id)
+                       }}">
+                <i class="fa fa-edit edit-icon"></i> {{ 'answers_show.edit'|trans }}
+              </a>
+            </td>
+          {% else %}
             <td></td>
             <td>
-{# {{ dump(itemClass) }} #}
-{# /admin/{entityType} #}
-              <a href="answer/new?question={{ question.id }}&{{ itemClass|lower }}={{ entity.instance.id }}&redirect=www.google.com">
+              <a href="{{ ea_url({
+                            system: entity.instance.id,
+                            question: question.id,
+                            referer,
+                         })
+                         .setController('App\\Controller\\Admin\\AnswerCrudController')
+                         .setAction('new')
+                         .setEntityId(null)
+                       }}">
                 <i class="fa fa-add new-icon"></i> {{ 'Opret Ny'|trans }}
               </a>
-
-{# <a href="answer/new?question={{ question.id }}&{{ itemClass | lower }}={{ entity.instance.id }} #}
-{# &redirect={{ path('dashboard'/itemClass }) | url_encode }}"> #}
-{# <i class="fa fa-add new-icon"></i> {{ 'Opret Ny' | trans }} #}
-{# </a> #}
-{# #}
-
             </td>
-          {% endif %}
+          {% endfor %}
           </td>
         </tr>
       {% endfor %}
     </table>
-    <br><br>
+
   {% endfor %}
 {% endfor %}
diff --git a/translations/messages.da.yml b/translations/messages.da.yml

Original file line number	Diff line number	Diff line change
`@@ -217,3 +217,10 @@ body.list table tbody td.dashboard--table-answer {`
`217`	`217`	`}`
`218`	`218`	`}`
`219`	`219`	`}`
	`220`	`+`
	`221`	`+/* Don't let fragment links stand out */`
	`222`	`+h2 {`
	`223`	`+ a {`
	`224`	`+ color: inherit;`
	`225`	`+ }`
	`226`	`+}`