Merge branch 'main' into develop

Author: rimi-itk

CHANGELOG.md

@@ -6,6 +6,9 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+* [PR-548](https://github.com/itk-dev/deltag.aarhus.dk/pull/548)
+  5479: Fixed handling of draft citizen proposals
+
 ## [4.13.0] - 2025-09-02
 
 * [PR-545](https://github.com/itk-dev/deltag.aarhus.dk/pull/545)

web/modules/custom/hoeringsportal_citizen_proposal/hoeringsportal_citizen_proposal.services.yml

@@ -11,7 +11,6 @@ services:
   Drupal\hoeringsportal_citizen_proposal\Helper\Helper:
     arguments:
       - "@tempstore.private"
-      - "@serializer"
       - "@state"
       - "@file_url_generator"
       - "@current_route_match"

web/modules/custom/hoeringsportal_citizen_proposal/src/Helper/Helper.php

@@ -25,7 +25,6 @@
 use Psr\Log\LoggerAwareInterface;
 use Psr\Log\LoggerAwareTrait;
 use Psr\Log\LoggerTrait;
-use Symfony\Component\Serializer\Serializer;
 
 /**
  * A helper class for the module.
@@ -47,7 +46,6 @@ class Helper implements LoggerAwareInterface {
    */
   public function __construct(
     readonly private PrivateTempStoreFactory $tempStoreFactory,
-    readonly private Serializer $serializer,
     readonly private StateInterface $state,
     readonly private FileUrlGenerator $fileUrlGenerator,
     readonly private RouteMatchInterface $routeMatch,
@@ -65,11 +63,10 @@ public function __construct(
    * @return object|null
    *   The entity or NULL if no valid entity was found.
    */
-  public function getDraftProposal(): ?object {
-    $entitySerialized = $this->getProposalStorage()->get(self::CITIZEN_PROPOSAL_ENTITY);
-    $node = is_string($entitySerialized) ? $this->serializer->deserialize($entitySerialized, Node::class, 'json') : NULL;
+  public function getDraftProposal(): ?NodeInterface {
+    $entity = $this->getProposalStorage()->get(self::CITIZEN_PROPOSAL_ENTITY);
 
-    return isset($node) && $node instanceof Node ? $node : NULL;
+    return $entity instanceof NodeInterface ? $entity : NULL;
   }
 
   /**
@@ -93,11 +90,10 @@ public function deleteDraftProposal(): void {
   /**
    * Add entity to temp store.
    */
-  public function setDraftProposal($entity): void {
-    $nodeSerialized = $this->serializer->serialize($entity, 'json');
+  public function setDraftProposal(NodeInterface $entity): void {
     try {
       $this->getProposalStorage()->set(
-        self::CITIZEN_PROPOSAL_ENTITY, $nodeSerialized
+        self::CITIZEN_PROPOSAL_ENTITY, $entity
       );
     }
     catch (\Exception $exception) {
@@ -514,7 +510,7 @@ public function isActive(NodeInterface $node): bool {
   /**
    * Get vote end date.
    */
-  public function getVoteEndDate(NodeInterface $node): int {
+  public function getVoteEndDate(NodeInterface $node): ?int {
     if (!$this->isCitizenProposal($node)) {
       return NULL;
     }