Use FormUid for controls ...

... to prevent the schedule view mode switcher resetting the
timezone picker.

Author: jrauh01

application/controllers/ScheduleController.php

@@ -56,15 +56,13 @@ public function indexAction(): void
             ->on(Form::ON_SUCCESS, function (ScheduleDetail\Controls $controls) use ($id) {
                 $redirectUrl = Links::schedule($id)->with(['mode' => $controls->getMode()]);
                 $requestUrl = Url::fromRequest();
-                if ($requestUrl->getParam('mode') !== $controls->getValue('mode')) {
-                    $defaultTimezoneParam = TimezonePicker::DEFAULT_TIMEZONE_PARAM;
-                    if ($requestUrl->hasParam($defaultTimezoneParam)) {
-                        $redirectUrl->addParams(
-                            [$defaultTimezoneParam => $requestUrl->getParam($defaultTimezoneParam)]
-                        );
-                    }
-                    $this->redirectNow($redirectUrl);
+                $defaultTimezoneParam = TimezonePicker::DEFAULT_TIMEZONE_PARAM;
+                if ($requestUrl->hasParam($defaultTimezoneParam)) {
+                    $redirectUrl->addParams(
+                        [$defaultTimezoneParam => $requestUrl->getParam($defaultTimezoneParam)]
+                    );
                 }
+                $this->redirectNow($redirectUrl);
             })
             ->handleRequest($this->getServerRequest());
 

library/Notifications/Web/Control/TimezonePicker.php

@@ -7,19 +7,24 @@
 use DateTimeZone;
 use ipl\Html\Form;
 use ipl\Html\HtmlElement;
+use ipl\Web\Common\FormUid;
 
 /**
  * A simple dropdown menu to pick a timezone.
  */
 class TimezonePicker extends Form
 {
+    use FormUid;
+
     /** @var string Default timezone param  */
     public const DEFAULT_TIMEZONE_PARAM = 'display_timezone';
 
-    protected $defaultAttributes = ['class' => 'timezone-picker'];
+    protected $defaultAttributes = ['class' => 'timezone-picker', 'name' => 'timezone-picker-form'];
 
     public function assemble(): void
     {
+        $this->addElement($this->createUidElement());
+
         $this->addElement(
             'select',
             static::DEFAULT_TIMEZONE_PARAM,

library/Notifications/Widget/Detail/ScheduleDetail/Controls.php

@@ -12,17 +12,19 @@
 use ipl\Html\HtmlElement;
 use ipl\Html\Text;
 use ipl\I18n\Translation;
+use ipl\Web\Common\FormUid;
 
 class Controls extends Form
 {
     use Translation;
+    use FormUid;
 
     /** @var string The default mode */
     public const DEFAULT_MODE = 'week';
 
     protected $method = 'POST';
 
-    protected $defaultAttributes = ['class' => 'schedule-controls'];
+    protected $defaultAttributes = ['class' => 'schedule-controls', 'name' => 'schedule-detail-controls-form'];
 
     /**
      * Get the chosen mode
@@ -74,6 +76,8 @@ protected function onSuccess()
 
     protected function assemble()
     {
+        $this->addElement($this->createUidElement());
+
         $param = 'mode';
         $options = [
             'day' => $this->translate('Day'),