Pre-release merge (#108)

madsnorgaard · agger-magenta · Toke Fritzemeier · web-flow · commit 4b4bd5e393c9 · 2022-01-11T09:55:29.000+01:00
* Fixing composer.lock to fetch fixed Forløb module release. * Add function to set username from webform submission. * Adding example webforms to enable flow with multiple webforms. * Make basic workflow work, without copying of fields. * New task class in place - now ready to implement the functionality. * Commit day's work. * Added form_alter hook to intercept submit on WebformMultiple task. * It works, next step some prettification. * Lint changes. * Fix notification by variable for part1 * Changed so that field names in source forms are prefixed with unique ID. * Remove composer update from CI check * Set composer update to get latest version per tag * Brushup before review. * Travis CI fix. * Remove tag versioning of forloeb module * Fix linting error. * Update README.md * Refactor unused webforms and flows * Add, install and configure r4032login module * Adjust description text * Rename template * Change category * Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used. * Remove rules modules as dependency * lock to dev branch * Remove Forløb profile as a dependency * [#46780] Removed all parts of HK/Holstebro, to make the webform generic and reusable for everyone. * [#46800] Created new task-type for inheriting webform in flow * [#46800] adding returns after logs * [#46800] Adding all form fields to 'prepareTaskForSave' * Enable URL override for webform submissions and hashed url patterns (#93) * Enable URL override for webform submissions and hashed url patterns * Move pathauto.settings.yml to profile * [#46800] Added custom field to parent prepareTaskForSave method * Merge master with develop (#97) * Merge develop with master (#90) * Fixing composer.lock to fetch fixed Forløb module release. * Add function to set username from webform submission. * Adding example webforms to enable flow with multiple webforms. * Make basic workflow work, without copying of fields. * New task class in place - now ready to implement the functionality. * Commit day's work. * Added form_alter hook to intercept submit on WebformMultiple task. * It works, next step some prettification. * Lint changes. * Fix notification by variable for part1 * Changed so that field names in source forms are prefixed with unique ID. * Remove composer update from CI check * Set composer update to get latest version per tag * Brushup before review. * Travis CI fix. * Remove tag versioning of forloeb module * Fix linting error. * Update README.md * Refactor unused webforms and flows * Add, install and configure r4032login module * Adjust description text * Rename template * Change category * Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used. * Remove rules modules as dependency * lock to dev branch * Remove Forløb profile as a dependency Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Pre-release PR develop into master (#95) * Fixing composer.lock to fetch fixed Forløb module release. * Add function to set username from webform submission. * Adding example webforms to enable flow with multiple webforms. * Make basic workflow work, without copying of fields. * New task class in place - now ready to implement the functionality. * Commit day's work. * Added form_alter hook to intercept submit on WebformMultiple task. * It works, next step some prettification. * Lint changes. * Fix notification by variable for part1 * Changed so that field names in source forms are prefixed with unique ID. * Remove composer update from CI check * Set composer update to get latest version per tag * Brushup before review. * Travis CI fix. * Remove tag versioning of forloeb module * Fix linting error. * Update README.md * Refactor unused webforms and flows * Add, install and configure r4032login module * Adjust description text * Rename template * Change category * Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used. * Remove rules modules as dependency * lock to dev branch * Remove Forløb profile as a dependency * [#46780] Removed all parts of HK/Holstebro, to make the webform generic and reusable for everyone. * [#46800] Created new task-type for inheriting webform in flow * [#46800] adding returns after logs * [#46800] Adding all form fields to 'prepareTaskForSave' * Enable URL override for webform submissions and hashed url patterns (#93) * Enable URL override for webform submissions and hashed url patterns * Move pathauto.settings.yml to profile * [#46800] Added custom field to parent prepareTaskForSave method Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * [#46800] Adding MaestroWebformInherit to os2forms_forloeb.module * [#46800] Added function that returns array of custom task-types and cleaned logic of if-statement * Refactor redundant menu link (#101) * Generalise client specific translation (#98) * Webform node element module as dependency. (#102) * Fix to bug on default purge setting not saving. (#99) * Fix to bug on default purge setting not saving. * Better handling of submissions purge logic * Refactor and webform save error * Small change to purge logic * Remove save_webform check logic to always save changes. * Refactor upon review * Updating version of coc_forms_auto_export (#104) To be able update project to Webform 6 we need to have coc_forms_auto_export updated to higher verison * Changes related to Drupal 9 compatibility (#105) * Merge develop with master (#90) * Fixing composer.lock to fetch fixed Forløb module release. * Add function to set username from webform submission. * Adding example webforms to enable flow with multiple webforms. * Make basic workflow work, without copying of fields. * New task class in place - now ready to implement the functionality. * Commit day's work. * Added form_alter hook to intercept submit on WebformMultiple task. * It works, next step some prettification. * Lint changes. * Fix notification by variable for part1 * Changed so that field names in source forms are prefixed with unique ID. * Remove composer update from CI check * Set composer update to get latest version per tag * Brushup before review. * Travis CI fix. * Remove tag versioning of forloeb module * Fix linting error. * Update README.md * Refactor unused webforms and flows * Add, install and configure r4032login module * Adjust description text * Rename template * Change category * Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used. * Remove rules modules as dependency * lock to dev branch * Remove Forløb profile as a dependency Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> * Pre-release PR develop into master (#95) * Fixing composer.lock to fetch fixed Forløb module release. * Add function to set username from webform submission. * Adding example webforms to enable flow with multiple webforms. * Make basic workflow work, without copying of fields. * New task class in place - now ready to implement the functionality. * Commit day's work. * Added form_alter hook to intercept submit on WebformMultiple task. * It works, next step some prettification. * Lint changes. * Fix notification by variable for part1 * Changed so that field names in source forms are prefixed with unique ID. * Remove composer update from CI check * Set composer update to get latest version per tag * Brushup before review. * Travis CI fix. * Remove tag versioning of forloeb module * Fix linting error. * Update README.md * Refactor unused webforms and flows * Add, install and configure r4032login module * Adjust description text * Rename template * Change category * Remove custom_theme and gin dependencies. The os2forms_forloeb module shouldn't make decisions about which theme to use. Leave that up to whichever install profile is being used. * Remove rules modules as dependency * lock to dev branch * Remove Forløb profile as a dependency * [#46780] Removed all parts of HK/Holstebro, to make the webform generic and reusable for everyone. * [#46800] Created new task-type for inheriting webform in flow * [#46800] adding returns after logs * [#46800] Adding all form fields to 'prepareTaskForSave' * Enable URL override for webform submissions and hashed url patterns (#93) * Enable URL override for webform submissions and hashed url patterns * Move pathauto.settings.yml to profile * [#46800] Added custom field to parent prepareTaskForSave method Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Added changes related to Drupal 9 compatibility * Updated ckeditor_a11ychecker module to 2.0.0-alpha1version Co-authored-by: Mads Nørgaard <madsnorgaard@live.dk> Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> * Added errormessage for WebformInherit * [#47585] Removed else-statement and changed check to is_array * Added error message for WebformInherit Co-authored-by: Carsten Agger <carstena@magenta-aps.dk> Co-authored-by: Carsten Agger <carstena@magenta.dk> Co-authored-by: Toke Fritzemeier <toke@magenta.dk> Co-authored-by: mb <mb@magenta-aps.dk> Co-authored-by: mBoegvald <36398987+mBoegvald@users.noreply.github.com> Co-authored-by: Andriyun <andriy.yun@gmail.com>
diff --git a/src/Plugin/EngineTasks/MaestroWebformInheritTask.php b/src/Plugin/EngineTasks/MaestroWebformInheritTask.php
@@ -11,6 +11,7 @@
 use Drupal\webform\Entity\Webform;
 use Drupal\Core\Ajax\AjaxResponse;
 use Drupal\Core\Ajax\ReplaceCommand;
+use Drupal\Core\Messenger;
 
 /**
  * Maestro Webform Task Plugin for Multiple Submissions.
@@ -131,16 +132,17 @@ public function getExecutableForm($modal, MaestroExecuteInteractive $parent) {
     // Create submission.
     $new_submission = WebformSubmission::create($values);
 
-    $errors = WebformSubmissionForm::validateWebformSubmission($webform_submission);
+    // Submit the webform submission
+    $submission = WebformSubmissionForm::submitWebformSubmission($new_submission);
 
-    if (!empty($errors)) {
+    // WebformSubmissionForm::submitWebformSubmission returns an array if the submission is not valid.
+    if (is_array($submission)) {
       \Drupal::logger('os2forms_forloeb')->error(
         "Can't create new submission: " . json_encode($errors)
       );
+      \Drupal::messenger()->addError('Webform data is invalid and could not be submitted.');
       return FALSE;
     }
-    // Submit it.
-    $new_submission = WebformSubmissionForm::submitWebformSubmission($new_submission);
 
     // Attach it to the Maestro process.
     $sid = $new_submission->id();
