Merge branch 'develop' into feature/issue-183-webform-auto-exports-initial-setting-save

Author: rimi-itk

CHANGELOG.md

@@ -11,6 +11,11 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+- [PR-228](https://github.com/OS2Forms/os2forms/pull/228)
+  Added Drupal Core patch ensuring conditionals based upon computed twig
+  works as intended.
+- [PR-215](https://github.com/OS2Forms/os2forms/pull/215)
+  Added condition to maestro notification submission handler
 - [PR-101](https://github.com/OS2Forms/os2forms/pull/101)
   - Added support for `os2web_key` in Digital post
     - Switched from saving settings in key value store to config, i.e
@@ -25,6 +30,8 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 - [PR-184](https://github.com/OS2Forms/os2forms/pull/184)
   - Patches `coc_forms_auto_export` to ensure settings can be saved upon initial
     attempt, cf. [Unable to save initial settings due to unfocusable form control](https://www.drupal.org/project/coc_forms_auto_export/issues/3531004)
+- [PR-222](https://github.com/OS2Forms/os2forms/pull/222)
+  Correctly sets sender label on Maestro digital post notifications.
 - [OS-199] Remove modules that are not used and not covered by central maintenance from OS2forms
 
 ## [4.1.0] 2025-06-03

composer.json

@@ -116,6 +116,9 @@
                 "3256951: - Unable to receive attachments in emails sent": "https://git.drupalcode.org/project/coc_forms_auto_export/-/merge_requests/11.diff",
                 "3531004: Unable to save initial settings due to unfocusable form control": "https://www.drupal.org/files/issues/2025-06-19/text_area_with_text_edit_always_fails_reqired_set_via_states.patch"
             },
+            "drupal/core": {
+                "Allow conditionals based on computed twig (https://www.drupal.org/project/webform/issues/3481569)": "https://www.drupal.org/files/issues/2024-11-05/revert-core-states.patch"
+            },
             "drupal/entity_print": {
                 "2733781 - Add Export to Word Support": "https://www.drupal.org/files/issues/2019-11-22/2733781-47.patch"
             },

modules/os2forms_forloeb/src/MaestroHelper.php

@@ -239,6 +239,7 @@ private function sendNotification(
         || $handler->isDisabled()
         || $handler->isExcluded()
         || !$handler->isNotificationEnabled($notificationType)
+        || !$handler->checkConditions($submission)
         ) {
           continue;
         }
@@ -250,13 +251,14 @@ private function sendNotification(
           'subject' => $subject,
           'taskUrl' => $taskUrl,
           'actionLabel' => $actionLabel,
+          'senderLabel' => $senderLabel,
         ] = $this->renderNotification($submission, $handler->getHandlerId(), $notificationType, $templateTask, $maestroQueueID);
 
         if ('email' === $contentType) {
           $this->sendNotificationEmail($recipient, $subject, $content, $submission, $notificationType);
         }
         else {
-          $this->sendNotificationDigitalPost($recipient, $subject, $content, $taskUrl, $actionLabel, $submission, $notificationType);
+          $this->sendNotificationDigitalPost($recipient, $subject, $content, $taskUrl, $actionLabel, $submission, $notificationType, $senderLabel);
         }
       }
     }
@@ -368,7 +370,9 @@ private function sendNotificationEmail(
    * @param \Drupal\webform\WebformSubmissionInterface $submission
    *   The webform submission.
    * @param string $notificationType
-   *   The notification type (one of the NOTIFICATION_* constannts).
+   *   The notification type (one of the NOTIFICATION_* constants).
+   * @param string $senderLabel
+   *   The sender label.
    */
   private function sendNotificationDigitalPost(
     string $recipient,
@@ -378,6 +382,7 @@ private function sendNotificationDigitalPost(
     string $actionLabel,
     WebformSubmissionInterface $submission,
     string $notificationType,
+    string $senderLabel,
   ): void {
     try {
       $document = new Document(
@@ -386,7 +391,6 @@ private function sendNotificationDigitalPost(
         $subject . '.pdf'
       );
 
-      $senderLabel = $subject;
       $messageLabel = $subject;
 
       $recipientLookupResult = $this->digitalPostHelper->lookupRecipient($recipient);
@@ -436,13 +440,13 @@ private function sendNotificationDigitalPost(
    * @param string $handlerId
    *   The handler ID.
    * @param string $notificationType
-   *   The notification type (one of the NOTIFICATION_* constannts).
+   *   The notification type (one of the NOTIFICATION_* constants).
    * @param array $templateTask
    *   The Maestro template task.
    * @param int $maestroQueueID
    *   The Maestro queue ID.
    * @param string|null $contentType
-   *   Optional content type. If not set the content type will be compoted based
+   *   Optional content type. If not set the content type will be computed based
    *   on the recipient.
    *
    * @return array
@@ -453,13 +457,20 @@ private function sendNotificationDigitalPost(
    *   - subject
    *   - taskUrl (for digital post)
    *   - actionLabel (for digital post)
+   *   - senderLabel (for digital post)
    *
    * @see self::renderHtml()
    */
   public function renderNotification(WebformSubmissionInterface $submission, string $handlerId, string $notificationType, array $templateTask, int $maestroQueueID, ?string $contentType = NULL): array {
     $handler = $submission->getWebform()->getHandler($handlerId);
     $settings = $handler->getSettings();
 
+    $senderLabel = $settings[MaestroNotificationHandler::NOTIFICATION][MaestroNotificationHandler::SENDER_LABEL] ?? NULL;
+
+    if (NULL === $senderLabel) {
+      throw new RuntimeException(sprintf('Cannot get setting for Maestro notification: %s', MaestroNotificationHandler::SENDER_LABEL));
+    }
+
     $data = $submission->getData();
     $recipientElement = $settings[MaestroNotificationHandler::NOTIFICATION][MaestroNotificationHandler::RECIPIENT_ELEMENT] ?? NULL;
     // Handle os2forms_person_lookup element.
@@ -558,6 +569,7 @@ public function renderNotification(WebformSubmissionInterface $submission, strin
         'subject' => $subject,
         'taskUrl' => $taskUrl,
         'actionLabel' => $actionLabel,
+        'senderLabel' => $senderLabel,
       ];
     }