Pre-release merge of develop into master (#103)

madsnorgaard · agger-magenta · Toke Fritzemeier · web-flow · commit cd807ea602a8 · 2021-12-10T10:24:20.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 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>
diff --git a/composer.json b/composer.json
@@ -44,6 +44,7 @@
     "drupal/ultimate_cron": "2.0.0-alpha5",
     "drupal/user_default_page": "2.0.0-rc1",
     "drupal/webform_composite": "1.0-rc2",
+    "drupal/webform_node_element": "1.2",
     "drupal/webform_remote_handlers": "^1.6.0",
     "drupal/webform_rest": "^4.0.0-beta2",
     "drupal/webform_scheduled_tasks": "^2.0",
diff --git a/config/optional/views.view.forlob_og_webformularer_til_sagsbehandling.yml b/config/optional/views.view.forlob_og_webformularer_til_sagsbehandling.yml
@@ -16,7 +16,7 @@ dependencies:
     module:
       - os2forms_forloeb
 id: forlob_og_webformularer_til_sagsbehandling
-label: 'Forløb og webformularer til sagsbehandling'
+label: 'Selvbetjeningsløsninger'
 module: views
 description: ''
 tag: ''
@@ -651,7 +651,7 @@ display:
           expose:
             label: ''
           granularity: second
-      title: 'Forløb og webformularer til sagsbehandling'
+      title: 'Selvbetjeningsløsninger'
       header: {  }
       footer: {  }
       empty: {  }
@@ -692,8 +692,8 @@ display:
       display_extenders: {  }
       path: sagsbehandler-overblik
       menu:
-        type: normal
-        title: 'Forløb og webformularer til sagsbehandling'
+        type: none
+        title: 'Selvbetjeningsløsninger'
         description: ''
         expanded: false
         parent: system.admin
diff --git a/os2forms_forloeb.info.yml b/os2forms_forloeb.info.yml
@@ -41,6 +41,7 @@ dependencies:
   - webform_entity_print
   - webform_entity_print_attachment
   - webform_migrate
+  - webform_node_element
   - webform_permissions_by_term
   - webform_remote_handlers
   - webform_rest
diff --git a/os2forms_forloeb.module b/os2forms_forloeb.module
@@ -128,13 +128,26 @@ function end_notification_batch_function($processID, $queueID) {
 
 /**
  * Implements hook_ENTITY_TYPE_create()
- * Sets a global purge setting for all webform submissions to 30 days
+ * Sets a global purge setting for all webform submissions to 30 days.
  */
 function os2forms_forloeb_webform_create(\Drupal\webform\WebformInterface $webform) {
-  // Set purge of all users submissions.
-  $webform->setSetting('purge', 'all');
-  // Set purge of submissions more than 30 days old.
-  $webform->setSetting('purge_days', '30');
+    // Set purge of all users submissions.
+    $webform->setSetting('purge', 'all');
+    // Set purge of submissions more than 30 days old.
+    if (empty($webform->getSetting('purge_days'))) {
+        $webform->setSetting('purge_days', '30');
+    }
+}
+
+/**
+ * Implements hook_ENTITY_TYPE_presave()
+ * Update webform specific submissions purge settings.
+ */
+function os2forms_forloeb_webform_presave(\Drupal\webform\WebformInterface $webform) {
+    // Add a purge time frame if not set.
+    if (empty($webform->getSetting('purge_days'))) {
+        $webform->setSetting('purge_days', 30);
+    }
 }
 
 /**
@@ -185,12 +198,21 @@ function os2forms_forloeb_spv_fetch_entity_username($uniqueWebformIdentifier, $w
   return $username;
 }
 
+/**
+ * Returns array of custom task-types for OS2forms
+ * 
+ */
+function os2forms_forloeb_get_custom_task_types() {
+  return ['MaestroWebformMultiple', 'MaestroWebformInherit'];
+}
+
 /**
  * Implements hook_form_alter() for MaestroWebformMultiple task type.
  *
  * This has been copied from
  * maestro/maestro_webform/maestro_webform.module with a minimal but
  * necessary change. See https://www.drupal.org/project/maestro/issues/3243510
+ * When that issue has been fixed, this hook implementation can be safely deleted.
  *
  */
 function os2forms_forloeb_form_alter(&$form, FormStateInterface $form_state, $form_id) {
@@ -199,8 +221,10 @@ function os2forms_forloeb_form_alter(&$form, FormStateInterface $form_state, $fo
   // Both these keys need to exist.
   if ($isMaestro && $queueID) {
     $templateTask = MaestroEngine::getTemplateTaskByQueueID($queueID);
-    // We only care about Maestro Webform Multiple tasks.
-    if ($templateTask && $templateTask['tasktype'] == 'MaestroWebformMultiple') {
+    // Get array of custom task-types
+    $os2forms_forloeb_custom_task_types = os2forms_forloeb_get_custom_task_types();
+    // We only care about custom Task-types defined in os2forms_forloeb_get_custom_task_types()
+    if ($templateTask && in_array($templateTask['tasktype'], $os2forms_forloeb_custom_task_types)) {
       $storage = $form_state->getStorage();
       if ($storage && array_key_exists('form_display', $storage)) {
         $webformTypes = \Drupal::entityTypeManager()->getStorage('node_type')->loadMultiple();
diff --git a/translations/os2forms_forloeb.da.po b/translations/os2forms_forloeb.da.po
@@ -1,4 +1,4 @@
-# Dansk translation of Selvbetjening Aarhus
+# Dansk translation of OS2forms med Forløb
 #
 msgid ""
 msgstr ""
@@ -272,8 +272,7 @@ msgstr ""
 
 msgid "Webform submission from: [webform_submission:source-title]"
 msgstr ""
-"Formular udfyldt fra selvbetjening.aarhuskommune.dk: "
-"[webform_submission:source-title]"
+"Formular udfyldt fra [site:name]: [webform_submission:source-title]"
 
 msgid ""
 "Submitted on [webform_submission:created]\n"
