Merge branch 'develop' into feature/DW-568-inherit-session

Author: rimi-itk

.gitignore

@@ -1,4 +1,5 @@
 # Ignore IntelliJ
 .idea/*
+
 composer.lock
 vendor

CHANGELOG.md

@@ -9,6 +9,14 @@ before starting to add changes.
 
 ## [Unreleased]
 
+## 2.5.0 - 11.10.2022
+
+### Added 
+- retry task controller action
+- Added support for inheriting values without creating a submission
+
+## 2.4.0 
+
 ### Added
 - Github CI action for checking Drupal Coding standards with PHP Code Sniffer
 - Fixed coding standards issues

composer.json

@@ -79,9 +79,6 @@
       },
       "drupal/coc_forms_auto_export": {
         "3240592 - Problem with phpseclib requirement in 2.x (https://www.drupal.org/project/coc_forms_auto_export/issues/3240592)": "https://www.drupal.org/files/issues/2021-10-04/requirement-namespace-3240592-1.patch"
-      },
-      "drupal/smtp": {
-        "Duplicated attachments in emails generated by Webform: (https://www.drupal.org/project/smtp/issues/2995290)": "https://www.drupal.org/files/issues/2021-11-02/smtp-2995290-23.patch"
       }
     }
   },
@@ -102,10 +99,10 @@
   "config": {
     "sort-packages": true,
     "allow-plugins": {
-      "cweagans/composer-patches": true,
-      "zaporylie/composer-drupal-optimizations": true,
+      "simplesamlphp/composer-module-installer": true,
       "dealerdirect/phpcodesniffer-composer-installer": true,
-      "simplesamlphp/composer-module-installer": true
+      "cweagans/composer-patches": true,
+      "zaporylie/composer-drupal-optimizations": true
     }
   }
 }

os2forms_forloeb.module

@@ -98,7 +98,7 @@ function os2forms_forloeb_workflow_maestro_reassign_form_submit(&$form, &$form_s
  */
 function os2forms_forloeb_maestro_batch_handlers() {
   return [
-    'end_notification_batch_function' => t('Batch function to send out flow completion notification to initiator.'),
+    '_os2forms_forloeb_end_notification_batch_function' => t('Batch function to send out flow completion notification to initiator.'),
   ];
 }
 
@@ -110,7 +110,7 @@ function os2forms_forloeb_maestro_batch_handlers() {
  * @param int $queueID
  *   The Maestro queue ID.
  */
-function end_notification_batch_function($processID, $queueID) {
+function _os2forms_forloeb_end_notification_batch_function($processID, $queueID) {
 
   /*
    * Pseudocode for handling this:

os2forms_forloeb.routing.yml

@@ -7,3 +7,13 @@ os2forms_forloeb.forloeb_task_console_controller_execute:
     _permission: 'access content'
   options:
     no_cache: TRUE
+
+os2forms_forloeb.forloeb_task_console_controller_execute_retry:
+  path: 'os2forms-forloeb/execute-task-retry'
+  defaults:
+    _controller: '\Drupal\os2forms_forloeb\Controller\ForloebTaskConsoleController::retry'
+    _title: 'Task not yet ready'
+  requirements:
+    _permission: 'access content'
+  options:
+    no_cache: TRUE

src/Controller/ForloebTaskConsoleController.php

@@ -5,6 +5,7 @@
 use Drupal\Component\Utility\UrlHelper;
 use Drupal\Core\Controller\ControllerBase;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
+use Drupal\Core\StringTranslation\StringTranslationTrait;
 use Drupal\Core\Url;
 use Drupal\maestro\Engine\MaestroEngine;
 use Drupal\maestro\Utility\TaskHandler;
@@ -19,6 +20,8 @@
  */
 class ForloebTaskConsoleController extends ControllerBase {
 
+  use StringTranslationTrait;
+
   /**
    * Update manager service.
    *
@@ -82,6 +85,12 @@ public function execute() {
     $token = $this->requestStack->getCurrentRequest()->query->get('os2forms-forloeb-ws-token', '');
     if ($token) {
       $queueRecord = $this->forloebTaskConsole->getQueueIdByWebformSubmissionToken($token);
+      if (empty($queueRecord)) {
+        return new RedirectResponse(
+          Url::fromRoute('os2forms_forloeb.forloeb_task_console_controller_execute_retry',
+          ['referrer' => \Drupal::request()->getRequestUri()])->toString()
+        );
+      }
     }
     else {
       // For empty token there is user last task from taskconsole queue.
@@ -150,4 +159,18 @@ public function execute() {
     return new RedirectResponse($redirect_to->toString());
   }
 
+  /**
+   * Show message about task not yet ready.
+   *
+   * @return array
+   *   The render array.
+   */
+  public function retry() {
+    $referrer = $this->requestStack->getCurrentRequest()->query->get('referrer', '#');
+
+    return [
+      '#markup' => $this->t('Your task is not yet ready. Please <a href=":referrer">try again</a> in 5 minutes.', [':referrer' => $referrer]),
+    ];
+  }
+
 }