fix(challenge): Correct hint implementation

The query will not update to Live Component model now, so we should get the query from the last query.

Besides, I remove the writable query model as it is completely unused now.

Author: pan93412

src/Twig/Components/Challenge/Instruction/Content.php

@@ -4,8 +4,7 @@
 
 namespace App\Twig\Components\Challenge\Instruction;
 
-use Psr\Log\LoggerInterface;
-use Symfony\Component\HttpKernel\Attribute\MapRequestPayload;
+use Symfony\Component\Serializer\SerializerInterface;
 use Symfony\UX\LiveComponent\Attribute\AsLiveComponent;
 use Symfony\UX\LiveComponent\Attribute\LiveArg;
 use Symfony\UX\LiveComponent\Attribute\LiveListener;
@@ -21,9 +20,9 @@ final class Content
     public ?HintPayload $hint = null;
 
     #[LiveListener('app:challenge-hint')]
-    public function onHintReceived(LoggerInterface $logger, #[LiveArg] #[MapRequestPayload] HintPayload $hint): void
+    public function onHintReceived(SerializerInterface $serializer, #[LiveArg] string $hint): void
     {
-        $logger->debug('Received hint', ['hint' => $hint]);
-        $this->hint = $hint;
+        $deserializedHint = $serializer->deserialize($hint, HintPayload::class, 'json');
+        $this->hint = $deserializedHint;
     }
 }

src/Twig/Components/Challenge/Instruction/Modal.php

@@ -7,6 +7,7 @@
 use App\Entity\HintOpenEvent;
 use App\Entity\Question;
 use App\Entity\User;
+use App\Repository\SolutionEventRepository;
 use App\Service\DbRunnerService;
 use App\Service\PointCalculationService;
 use App\Service\PromptService;
@@ -33,9 +34,6 @@ final class Modal
     #[LiveProp]
     public Question $question;
 
-    #[LiveProp(updateFromParent: true)]
-    public string $query = '';
-
     public function getCost(): int
     {
         return PointCalculationService::hintOpenEventPoint;
@@ -48,6 +46,7 @@ public function getCost(): int
      */
     #[LiveAction]
     public function instruct(
+        SolutionEventRepository $solutionEventRepository,
         DbRunnerService $dbRunnerService,
         PromptService $promptService,
         TranslatorInterface $translator,
@@ -62,7 +61,8 @@ public function instruct(
             throw new BadRequestHttpException('Hint feature is disabled.');
         }
 
-        if ('' === $this->query) {
+        $query = $solutionEventRepository->getLatestQuery($this->question, $this->currentUser);
+        if (null === $query) {
             return;
         }
 
@@ -72,7 +72,7 @@ public function instruct(
         $hintOpenEvent = (new HintOpenEvent())
             ->setOpener($this->currentUser)
             ->setQuestion($this->question)
-            ->setQuery($this->query);
+            ->setQuery($query->getQuery());
 
         // run answer. if it failed, we should consider it an error
         try {
@@ -87,13 +87,13 @@ public function instruct(
 
         try {
             // run query to get the error message (or compare the result)
-            $result = $dbRunnerService->runQuery($schema, $this->query);
+            $result = $dbRunnerService->runQuery($schema, $query->getQuery());
         } catch (\Throwable $e) {
-            $hint = $promptService->hint($this->query, $e->getMessage(), $answer);
+            $hint = $promptService->hint($query->getQuery(), $e->getMessage(), $answer);
         }
 
         if (isset($result) && $result !== $answerResult) {
-            $hint = $promptService->hint($this->query, 'Different output', $answer);
+            $hint = $promptService->hint($query->getQuery(), 'Different output', $answer);
         }
 
         if (!isset($hint)) {

src/Twig/Components/Challenge/Ui.php

@@ -23,10 +23,4 @@ final class Ui
 
     #[LiveProp]
     public int $limit;
-
-    /**
-     * @var string $query the user's query
-     */
-    #[LiveProp(writable: true)]
-    public string $query = '';
 }

templates/components/Challenge/Ui.html.twig

@@ -4,15 +4,15 @@
         <twig:Challenge:SolutionVideoModal class="challenge-solution-video-modal" :question="question" :user="user" />
     {% endif %}
     {% if appfeatures.hint %}
-        <twig:Challenge:Instruction:Modal class="challenge-instruction-modal" :question="question" :currentUser="user" :query="query" />
+        <twig:Challenge:Instruction:Modal class="challenge-instruction-modal" :question="question" :currentUser="user" />
     {% endif %}
 
     <main>
         <twig:Challenge:Header class="mb-2" :question="question" :limit="limit" :user="user" />
         <hr class="opacity-50">
         <section class="app-challenge-primary row g-4">
             <div class="app-challenge-primary__left col-12 col-md-6">
-                <twig:Challenge:Executor class="mt-2" data-model="query:query" :question="question" :user="user">
+                <twig:Challenge:Executor class="mt-2" :question="question" :user="user">
                     <twig:block name="actions">
                         <div class="btn-group">
                             {% if appfeatures.hint %}