Changes related to Drupal 9 compatibility

composer.json

@@ -19,15 +19,15 @@
     "cweagans/composer-patches": "^1.6.5",
     "drupal/admin_toolbar": "^3.0",
     "drupal/chosen": "2.10.0",
-    "drupal/ckeditor_a11ychecker": "1.0.0",
+    "drupal/ckeditor_a11ychecker": "2.0.0-alpha1",
     "drupal/clientside_validation": "3.0.0-rc4",
-    "drupal/coc_forms_auto_export": "1.0.0-alpha1",
+    "drupal/coc_forms_auto_export": "2.0.0-alpha1",
     "drupal/config_entity_revisions": "1.7.0",
-    "drupal/events_logging": "1.4.0",
+    "drupal/events_logging": "1.5.0",
     "drupal/embed": "1.4.0",
-    "drupal/header_and_footer_scripts": "2.2.0",
+    "drupal/header_and_footer_scripts": "3.0.0",
     "drupal/image_widget_crop": "2.3.0",
-    "drupal/ldap": "^3.0@beta",
+    "drupal/ldap": "^4.2",
     "drupal/ldap_auth": "^1.17",
     "drupal/libraries": "3.0.0-beta1",
     "drupal/linkit": "^5.0",
@@ -37,22 +37,18 @@
     "drupal/queue_mail": "1.3.0",
     "drupal/queue_ui": "^2.1",
     "drupal/r4032login": "^2.1",
-    "drupal/rules": "3.0.0-alpha6",
-    "drupal/rules_token": "1.2.0",
-    "drupal/rules_webform": "1.5.0",
     "drupal/simple_ldap": "1.0.0-alpha3",
     "drupal/simplesamlphp_auth": "3.2.0",
-    "drupal/switch_page_theme": "1.0",
+    "drupal/switch_page_theme": "1.x-dev#ac38137f43cc72a8efba04bc127b87fbf2c28e06",
     "drupal/telephone_validation": "^2.2",
     "drupal/ultimate_cron": "2.0.0-alpha5",
-    "drupal/user_default_page": "2.0.0-rc1",
+    "drupal/user_default_page": "2.1",
     "drupal/webform_composite": "1.0-rc2",
     "drupal/webform_remote_handlers": "^1.6.0",
     "drupal/webform_rest": "^4.0.0-beta2",
     "drupal/webform_scheduled_tasks": "^2.0",
     "drupal/webform_views": "^5.0@alpha",
     "drupal/workflow_participants": "^2.4",
-    "os2forms/os2forms_forloeb_profile": "^1.0",
     "webmozart/path-util": "2.3.0",
     "zaporylie/composer-drupal-optimizations": "1.2.0"
   },

config/optional/pathauto.pattern.anonymous_submissions.yml

@@ -0,0 +1,13 @@
+status: true
+dependencies:
+  module:
+  - ctools
+  - webform
+id: anonymous_submissions
+label: 'Anonymisering af indsendelser'
+type: 'canonical_entities:webform_submission'
+pattern: 'indsendelse/[random:hash:sha1]'
+selection_criteria: {  }
+selection_logic: and
+weight: 0
+relationships: {  }

os2forms_forloeb.info.yml

@@ -26,9 +26,6 @@ dependencies:
   - pathauto
   - r4032login
   - redirect
-  - rules
-  - rules_token
-  - rules_webform
   - smtp
   - system
   - switch_page_theme

os2forms_forloeb.module

@@ -67,7 +67,7 @@ function os2forms_forloeb_workflow_maestro_reassign_form_submit(&$form, &$form_s
   //Who was selected? Load their username, which is the user attribute that Maestro assigns tasks by.
   $reviewer_uid = $form_state->getValue('reviewer');
   $reviewer = \Drupal\user\Entity\User::load($reviewer_uid); // pass your uid
-  $reviewer_username = $reviewer->getUsername();
+  $reviewer_username = $reviewer->getAccountName();
 
   //add that user to our maestro process variable.
   MaestroEngine::setProcessVariable("assigned_to", $reviewer_username, $processID);

src/Plugin/EngineTasks/MaestroWebformInheritTask.php

@@ -0,0 +1,154 @@
+<?php
+
+namespace Drupal\os2forms_forloeb\Plugin\EngineTasks;
+
+use Drupal\webform\Entity\WebformSubmission;
+use Drupal\webform\WebformSubmissionForm;
+use Drupal\maestro_webform\Plugin\EngineTasks\MaestroWebformTask;
+use Drupal\maestro\Form\MaestroExecuteInteractive;
+use Drupal\maestro\Engine\MaestroEngine;
+use Drupal\Core\Form\FormStateInterface;
+use Drupal\webform\Entity\Webform;
+use Drupal\Core\Ajax\AjaxResponse;
+use Drupal\Core\Ajax\ReplaceCommand;
+
+/**
+ * Maestro Webform Task Plugin for Multiple Submissions.
+ *
+ * @Plugin(
+ *   id = "MaestroWebformInherit",
+ *   task_description = @Translation("Maestro Webform task for multiple submissions."),
+ * )
+ */
+class MaestroWebformInheritTask extends MaestroWebformTask {
+
+  /**
+   * Constructor.
+   *
+   * @param array $configuration
+   *   The incoming configuration information from the engine execution.
+   *   [0] - is the process ID
+   *   [1] - is the queue ID
+   *   The processID and queueID properties are defined in the MaestroTaskTrait.
+   */
+  public function __construct(array $configuration = NULL) {
+    if (is_array($configuration)) {
+      $this->processID = $configuration[0];
+      $this->queueID = $configuration[1];
+    }
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function shortDescription() {
+    return t('Webform with Inherited submission');
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function description() {
+    return $this->t('Webform with Inherited submission');
+  }
+
+  /**
+   * {@inheritDoc}
+   *
+   * @see \Drupal\Component\Plugin\PluginBase::getPluginId()
+   */
+  public function getPluginId() {
+    return 'MaestroWebformInherit';
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getTaskEditForm(array $task, $templateMachineName) {
+
+    // We call the parent, as we need to add a field to the inherited form
+    $form = parent::getTaskEditForm($task, $templateMachineName);
+    $form['inherit_webform_unique_id'] = [
+      '#type' => 'textfield',
+      '#title' => $this->t('Inherit Webform from:'),
+      '#description' => $this->t('Put the unique identifier of the webform you want to inherit from (start-task=submission'),
+      '#default_value' => $task['data']['inherit_webform_unique_id'] ?? '',
+      '#required' => TRUE,
+    ];
+    return $form;
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function prepareTaskForSave(array &$form, FormStateInterface $form_state, array &$task) {
+
+    // Inherit from parent
+    parent::prepareTaskForSave($form, $form_state, $task);
+    // Add custom field(s) to the inherited prepareTaskForSave method.
+    $task['data']['inherit_webform_unique_id'] = $form_state->getValue('inherit_webform_unique_id');
+  }
+
+  /**
+   * {@inheritDoc}
+   */
+  public function getExecutableForm($modal, MaestroExecuteInteractive $parent) {
+
+    // First, get hold of the interesting previous tasks.
+    $templateMachineName = MaestroEngine::getTemplateIdFromProcessId($this->processID);
+    $taskMachineName = MaestroEngine::getTaskIdFromQueueId($this->queueID);
+    $task = MaestroEngine::getTemplateTaskByID($templateMachineName, $taskMachineName);
+
+    // Get user input from 'inherit_webform_unique_id'
+    $webformInheritID = $task['data']['inherit_webform_unique_id'];
+
+    // Load its corresponding webform submission.
+    $sid = MaestroEngine::getEntityIdentiferByUniqueID($this->processID, $webformInheritID);
+    if ($sid) {
+      $webform_submission = WebformSubmission::load($sid);
+    }
+    if (!isset($webform_submission)) {
+      \Drupal::logger('os2forms_forloeb')->error(
+        "Predecessors must have submissions with webforms attached."
+      );
+      return FALSE;
+    }
+    // Copy the fields of the webform submission to the values array.
+    foreach ($webform_submission->getData() as $key => $value) {
+      if ($value) {
+        $field_values[$webformInheritID . '_' . $key] = $value;
+      }
+    }
+    // Now create webform submission, submit and attach to current process.
+    $templateTask = MaestroEngine::getTemplateTaskByQueueID($this->queueID);
+    $taskUniqueSubmissionId = $templateTask['data']['unique_id'];
+    $webformMachineName = $templateTask['data']['webform_machine_name'];
+
+    $values = [];
+    $values['webform_id'] = $webformMachineName;
+    $values['data'] = $field_values;
+
+    // Create submission.
+    $new_submission = WebformSubmission::create($values);
+
+    $errors = WebformSubmissionForm::validateWebformSubmission($webform_submission);
+
+    if (!empty($errors)) {
+      \Drupal::logger('os2forms_forloeb')->error(
+        "Can't create new submission: " . json_encode($errors)
+      );
+      return FALSE;
+    }
+    // Submit it.
+    $new_submission = WebformSubmissionForm::submitWebformSubmission($new_submission);
+
+    // Attach it to the Maestro process.
+    $sid = $new_submission->id();
+    MaestroEngine::createEntityIdentifier(
+      $this->processID, $new_submission->getEntityTypeId(),
+      $new_submission->bundle(), $taskUniqueSubmissionId, $sid
+    );
+
+    return parent::getExecutableForm($modal, $parent);
+  }
+}