Merge branch 'release/3.14.0'

* release/3.14.0:
  Preparing 3.14.0
  OS-64 Setting a standard value for Automatic purge

CHANGELOG.md

@@ -11,6 +11,10 @@ before starting to add changes. Use example [placed in the end of the page](#exa
 
 ## [Unreleased]
 
+## [3.14.0]
+
+- [OS-64] Setting a standard value for Automatic purge [#80](https://github.com/OS2Forms/os2forms/pull/80)
+
 ## [3.13.3] 2023-12-05
 
 - [#76](https://github.com/OS2Forms/os2forms/pull/76)

modules/os2forms_forloeb/os2forms_forloeb.module

@@ -144,9 +144,14 @@ function _os2forms_forloeb_end_notification_batch_function($processID, $queueID)
 function os2forms_forloeb_webform_create(WebformInterface $webform) {
   // Set purge of all users submissions.
   $webform->setSetting('purge', 'all');
-  // Set purge of submissions more than 30 days old.
+
+  // Set purge of submissions if empty.
   if (empty($webform->getSetting('purge_days'))) {
-    $webform->setSetting('purge_days', '30');
+    /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+    $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+    $os2forms_forloeb_settings = $third_party_settings_manager->getThirdPartySetting('os2forms', 'os2forms_forloeb') ?: 30;
+
+    $webform->setSetting('purge_days', $os2forms_forloeb_settings['purge_days']);
   }
 }
 
@@ -158,7 +163,11 @@ function os2forms_forloeb_webform_create(WebformInterface $webform) {
 function os2forms_forloeb_webform_presave(WebformInterface $webform) {
   // Add a purge time frame if not set.
   if (empty($webform->getSetting('purge_days'))) {
-    $webform->setSetting('purge_days', 30);
+    /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+    $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+    $os2forms_forloeb_settings = $third_party_settings_manager->getThirdPartySetting('os2forms', 'os2forms_forloeb') ?: 30;
+
+    $webform->setSetting('purge_days', $os2forms_forloeb_settings['purge_days']);
   }
 }
 
@@ -374,3 +383,21 @@ function os2forms_forloeb_theme(array &$variables) {
 function _os2forms_forloeb_helper(): MaestroHelper {
   return Drupal::service(MaestroHelper::class);
 }
+
+/**
+ * Implements hook_form_FORM_ID_alter().
+ *
+ * Exposing settings for general OS2forms admin settings.
+ */
+function os2forms_forloeb_form_os2forms_settings_alter(&$form, FormStateInterface $form_state) {
+  /** @var \Drupal\webform\WebformThirdPartySettingsManagerInterface $third_party_settings_manager */
+  $third_party_settings_manager = \Drupal::service('webform.third_party_settings_manager');
+  $os2forms_forloeb_settings = $third_party_settings_manager->getThirdPartySetting('os2forms', 'os2forms_forloeb') ?: 30;
+
+  $form['third_party_settings']['os2forms']['os2forms_forloeb']['purge_days'] = [
+    '#type' => 'textfield',
+    '#title' => t('Default number of days to retain submissions'),
+    '#default_value' => !(empty($os2forms_forloeb_settings)) ? $os2forms_forloeb_settings['purge_days'] : 30,
+    '#description' => t('Default value is used when creating a new form, after that it is saved on a form level'),
+  ];
+}

src/Form/SettingsForm.php

@@ -74,6 +74,10 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
       foreach ($settings as $settingKey => $settingValues) {
         $savedSettings = $this->thirdPartySettingsManager->getThirdPartySetting($module_key, $settingKey);
         if (is_array($settingValues)) {
+          if (!$savedSettings) {
+            $savedSettings = [];
+          }
+
           $savedSettings = array_replace($savedSettings, $settingValues);
         }
         else {