Merge pull request #55 from itk-dev/develop

Release 2021-09-17

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/os2loop_mail_notifications.module

@@ -5,6 +5,7 @@
  * Hooks for OS2Loop Mail notifications.
  */
 
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Render\BubbleableMetadata;
 
 /**
@@ -42,3 +43,12 @@ function os2loop_mail_notifications_tokens($type, $tokens, array $data, array $o
 function os2loop_mail_notifications_token_info() {
   return Drupal::service('os2loop_mail_notifications.mail_helper')->tokenInfo();
 }
+
+/**
+ * Implements hook_user_insert().
+ *
+ * @see \Drupal\os2loop_mail_notifications\Helper\Helper::userInsert()
+ */
+function os2loop_mail_notifications_user_insert(EntityInterface $entity) {
+  return Drupal::service('os2loop_mail_notifications.helper')->userInsert($entity);
+}

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/os2loop_mail_notifications.services.yml

@@ -2,6 +2,7 @@ services:
   os2loop_mail_notifications.helper:
     class: Drupal\os2loop_mail_notifications\Helper\Helper
     arguments:
+      - '@Drupal\os2loop_settings\Settings'
       - '@state'
       - '@user.data'
       - '@entity_type.manager'

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Form/SettingsForm.php

@@ -3,6 +3,7 @@
 namespace Drupal\os2loop_mail_notifications\Form;
 
 use Drupal\Core\Config\ConfigFactoryInterface;
+use Drupal\Core\Entity\EntityFieldManagerInterface;
 use Drupal\Core\Form\ConfigFormBase;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -29,12 +30,20 @@ class SettingsForm extends ConfigFormBase {
    */
   private $settings;
 
+  /**
+   * The entity field manager.
+   *
+   * @var \Drupal\Core\Entity\EntityFieldManagerInterface
+   */
+  private $entityFieldManager;
+
   /**
    * Constructor.
    */
-  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings) {
+  public function __construct(ConfigFactoryInterface $config_factory, Settings $settings, EntityFieldManagerInterface $entityFieldManager) {
     parent::__construct($config_factory);
     $this->settings = $settings;
+    $this->entityFieldManager = $entityFieldManager;
   }
 
   /**
@@ -43,7 +52,8 @@ public function __construct(ConfigFactoryInterface $config_factory, Settings $se
   public static function create(ContainerInterface $container) {
     return new static(
       $container->get('config.factory'),
-      $container->get(Settings::class)
+      $container->get(Settings::class),
+      $container->get('entity_field.manager')
     );
   }
 
@@ -96,6 +106,21 @@ public function buildForm(array $form, FormStateInterface $form_state) {
       '#token_types' => ['user', 'node', 'os2loop_mail_notifications'],
     ];
 
+    $userFields = $this->entityFieldManager->getFieldDefinitions('user', 'user');
+    $notificationIntervalField = $userFields['os2loop_mail_notifications_intvl'] ?? NULL;
+    if (NULL !== $notificationIntervalField) {
+      $options = $notificationIntervalField->getSetting('allowed_values');
+
+      $form['default_user_notification_interval'] = [
+        '#type' => 'select',
+        '#title' => $this->t('Default user notification interval'),
+        '#options' => $options,
+        '#empty_option' => $this->t('- None -'),
+        '#default_value' => $config->get('default_user_notification_interval'),
+        '#description' => $this->t('Notification interval to use if user has not set a notification interval.'),
+      ];
+    }
+
     return parent::buildForm($form, $form_state);
   }
 
@@ -117,6 +142,7 @@ public function submitForm(array &$form, FormStateInterface $form_state) {
     $this->configFactory->getEditable(static::SETTINGS_NAME)
       ->set('template_subject', $form_state->getValue('template_subject'))
       ->set('template_body', $form_state->getValue('template_body'))
+      ->set('default_user_notification_interval', $form_state->getValue('default_user_notification_interval'))
       ->save();
 
     drupal_flush_all_caches();

web/profiles/custom/os2loop/modules/os2loop_mail_notifications/src/Helper/Helper.php

@@ -4,12 +4,15 @@
 
 use Drupal\Core\Database\Connection;
 use Drupal\Core\Datetime\DrupalDateTime;
+use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Entity\EntityTypeManagerInterface;
 use Drupal\Core\Field\EntityReferenceFieldItemListInterface;
 use Drupal\Core\Logger\LoggerChannelFactoryInterface;
 use Drupal\Core\State\StateInterface;
 use Drupal\message\Entity\Message;
 use Drupal\node\NodeInterface;
+use Drupal\os2loop_mail_notifications\Form\SettingsForm;
+use Drupal\os2loop_settings\Settings;
 use Drupal\user\Entity\User;
 use Drupal\user\UserDataInterface;
 use Drupal\user\UserInterface;
@@ -59,6 +62,13 @@ class Helper {
     'os2loop_subscription_term',
   ];
 
+  /**
+   * The module config.
+   *
+   * @var \Drupal\Core\Config\ImmutableConfig
+   */
+  private $config;
+
   /**
    * The state.
    *
@@ -104,7 +114,8 @@ class Helper {
   /**
    * Helper constructor.
    */
-  public function __construct(StateInterface $state, UserDataInterface $userData, EntityTypeManagerInterface $entityTypeManager, Connection $database, MailHelper $mailHelper, LoggerChannelFactoryInterface $loggerFactory) {
+  public function __construct(Settings $settings, StateInterface $state, UserDataInterface $userData, EntityTypeManagerInterface $entityTypeManager, Connection $database, MailHelper $mailHelper, LoggerChannelFactoryInterface $loggerFactory) {
+    $this->config = $settings->getConfig(SettingsForm::SETTINGS_NAME);
     $this->state = $state;
     $this->userData = $userData;
     $this->entityTypeManager = $entityTypeManager;
@@ -164,6 +175,22 @@ public function sendNotifications(DrupalDateTime $now) {
     }
   }
 
+  /**
+   * Implements hook_user_insert().
+   *
+   * Sets default notification interval on new user if requested.
+   */
+  public function userInsert(EntityInterface $entity) {
+    if ($entity instanceof UserInterface) {
+      $default_user_notification_interval = $this->config->get('default_user_notification_interval') ?? '';
+      if ('' !== $default_user_notification_interval) {
+        $entity
+          ->set('os2loop_mail_notifications_intvl', $default_user_notification_interval)
+          ->save();
+      }
+    }
+  }
+
   /**
    * Map from user id to user's last notification time.
    *

web/profiles/custom/os2loop/modules/os2loop_media/src/Helper/Helper.php

@@ -2,6 +2,7 @@
 
 namespace Drupal\os2loop_media\Helper;
 
+use Drupal\Core\DependencyInjection\DependencySerializationTrait;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\Core\Session\AccountProxyInterface;
 use Drupal\Core\StringTranslation\StringTranslationTrait;
@@ -13,6 +14,7 @@
  * The helper.
  */
 class Helper {
+  use DependencySerializationTrait;
   use StringTranslationTrait;
   /**
    * The current user.