Move session handling to ScheduleController

Instead of handling the session in `TimezonePicker`.

Author: jrauh01

application/controllers/ScheduleController.php

@@ -16,6 +16,7 @@
 use Icinga\Module\Notifications\Widget\Detail\ScheduleDetail;
 use Icinga\Module\Notifications\Widget\RecipientSuggestions;
 use Icinga\Module\Notifications\Widget\TimezoneWarning;
+use Icinga\Web\Session;
 use ipl\Html\Form;
 use ipl\Html\Html;
 use ipl\Stdlib\Filter;
@@ -66,7 +67,10 @@ public function indexAction(): void
         $this->addContent(new ScheduleDetail(
             $schedule,
             $scheduleControls,
-            new DateTime('today', new DateTimeZone($timezonePicker->getDisplayTimezone()))
+            new DateTime('today', new DateTimeZone(
+                $timezonePicker->getValue(TimezonePicker::DEFAULT_TIMEZONE_PARAM)
+                    ?? $this->getDisplayTimezoneFromSession($schedule->timezone)
+            )),
         ));
     }
 
@@ -121,7 +125,7 @@ public function addRotationAction(): void
     {
         $scheduleId = (int) $this->params->getRequired('schedule');
         $scheduleTimezone = $this->getScheduleTimezone($scheduleId);
-        $displayTimezone = (new TimezonePicker($scheduleTimezone))->getDisplayTimezone();
+        $displayTimezone = $this->getDisplayTimezoneFromSession($scheduleTimezone);
         $this->setTitle($this->translate('Add Rotation'));
 
         if ($displayTimezone !== $scheduleTimezone) {
@@ -160,7 +164,7 @@ public function editRotationAction(): void
         $id = (int) $this->params->getRequired('id');
         $scheduleId = (int) $this->params->getRequired('schedule');
         $scheduleTimezone = $this->getScheduleTimezone($scheduleId);
-        $displayTimezone = (new TimezonePicker($scheduleTimezone))->getDisplayTimezone();
+        $displayTimezone = $this->getDisplayTimezoneFromSession($scheduleTimezone);
         $this->setTitle($this->translate('Edit Rotation'));
 
         if ($displayTimezone !== $scheduleTimezone) {
@@ -254,17 +258,45 @@ protected function getScheduleTimezone(int $scheduleId): string
      */
     protected function createTimezonePicker(string $scheduleTimezone, int $scheduleId): TimezonePicker
     {
-        return (new TimezonePicker($scheduleTimezone))
+        $defaultTimezoneParam = TimezonePicker::DEFAULT_TIMEZONE_PARAM;
+        return (new TimezonePicker())
             ->populate([
-                TimezonePicker::DEFAULT_TIMEZONE_PARAM => $this->params->get(TimezonePicker::DEFAULT_TIMEZONE_PARAM)
+                $defaultTimezoneParam => $this->params->get($defaultTimezoneParam)
+                    ?? $this->getDisplayTimezoneFromSession($scheduleTimezone)
             ])
-            ->on(TimezonePicker::ON_SUBMIT, function (TimezonePicker $timezonePicker) use ($scheduleId) {
-                $this->redirectNow(
-                    Links::schedule($scheduleId)->with([
-                        TimezonePicker::DEFAULT_TIMEZONE_PARAM => $timezonePicker->getDisplayTimezone()
-                    ])
-                );
-            })
+            ->on(
+                TimezonePicker::ON_SUBMIT,
+                function (TimezonePicker $timezonePicker) use ($defaultTimezoneParam, $scheduleId, $scheduleTimezone) {
+                    $this->writeDisplayTimezoneToSession($timezonePicker->getValue($defaultTimezoneParam));
+                    $this->redirectNow(Links::schedule($scheduleId)->with([
+                        $defaultTimezoneParam => $timezonePicker->getValue($defaultTimezoneParam)
+                    ]));
+                }
+            )
             ->handleRequest($this->getServerRequest());
     }
+
+    /**
+     * Get the display timezone from the session
+     *
+     * @param string|null $defaultTimezone
+     *
+     * @return string
+     */
+    protected function getDisplayTimezoneFromSession(?string $defaultTimezone = null): string
+    {
+        return Session::getSession()->getNamespace('notifications')->get('schedule.display_timezone', $defaultTimezone);
+    }
+
+    /**
+     * Write the display timezone to the session
+     *
+     * @param string $displayTimezone
+     *
+     * @return void
+     */
+    protected function writeDisplayTimezoneToSession(string $displayTimezone): void
+    {
+        Session::getSession()->getNamespace('notifications')->set('schedule.display_timezone', $displayTimezone);
+    }
 }

library/Notifications/Web/Control/TimezonePicker.php

@@ -6,7 +6,6 @@
 
 use DateTime;
 use DateTimeZone;
-use Icinga\Web\Session;
 use IntlTimeZone;
 use ipl\Html\Form;
 use ipl\I18n\Translation;
@@ -29,36 +28,6 @@ class TimezonePicker extends Form
         'name' => 'timezone-picker-form'
     ];
 
-    protected string $defaultTimezone;
-
-    public function __construct(string $defaultTimezone)
-    {
-        $this->defaultTimezone = $defaultTimezone;
-    }
-
-    /**
-     * Get the chosen display timezone
-     *
-     * @return string
-     */
-    public function getDisplayTimezone(): string
-    {
-        return $this->getPopulatedValue(static::DEFAULT_TIMEZONE_PARAM)
-            ?? Session::getSession()->getNamespace('notifications')
-                ->get('schedule.display_timezone', $this->defaultTimezone);
-    }
-
-    /**
-     * On success store the display timezone in the session
-     *
-     * @return void
-     */
-    protected function onSuccess(): void
-    {
-        Session::getSession()->getNamespace('notifications')
-            ->set('schedule.display_timezone', $this->getValue(static::DEFAULT_TIMEZONE_PARAM));
-    }
-
     public function assemble(): void
     {
         $this->addElement($this->createUidElement());
@@ -83,7 +52,5 @@ public function assemble(): void
                 'options' => $validTz
             ]
         );
-        $select = $this->getElement(static::DEFAULT_TIMEZONE_PARAM);
-        $select->setValue($this->getDisplayTimezone());
     }
 }