fix: Email Notification saving

- fix: SMTP and resend should only save their respective settings
- chore: improve component validation and code to make it much smaller (less code - same functionality)

app/Livewire/Notifications/Email.php

@@ -31,11 +31,11 @@ class Email extends Component
     #[Validate(['nullable', 'string'])]
     public ?string $smtpHost = null;
 
-    #[Validate(['nullable', 'numeric'])]
+    #[Validate(['nullable', 'numeric', 'min:1', 'max:65535'])]
     public ?int $smtpPort = null;
 
     #[Validate(['nullable', 'string', 'in:tls,ssl,none'])]
-    public ?string $smtpEncryption = null;
+    public ?string $smtpEncryption = 'tls';
 
     #[Validate(['nullable', 'string'])]
     public ?string $smtpUsername = null;
@@ -170,6 +170,136 @@ class Email extends Component
         }
     }
 
+    public function submit()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->saveModel();
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
+    public function saveModel()
+    {
+        $this->syncData(true);
+        refreshSession();
+        $this->dispatch('success', 'Email notifications settings updated.');
+    }
+
+    public function instantSave(?string $type = null)
+    {
+        try {
+            $this->resetErrorBag();
+
+            if ($type === 'SMTP') {
+                $this->submitSmtp();
+            } elseif ($type === 'Resend') {
+                $this->submitResend();
+            } else {
+                $this->smtpEnabled = false;
+                $this->resendEnabled = false;
+                $this->saveModel();
+
+                return;
+            }
+        } catch (\Throwable $e) {
+            if ($type === 'SMTP') {
+                $this->smtpEnabled = false;
+            } elseif ($type === 'Resend') {
+                $this->resendEnabled = false;
+            }
+
+            return handleError($e, $this);
+        }
+    }
+
+    public function submitSmtp()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'smtpEnabled' => 'boolean',
+                'smtpFromAddress' => 'required|email',
+                'smtpFromName' => 'required|string',
+                'smtpHost' => 'required|string',
+                'smtpPort' => 'required|numeric',
+                'smtpEncryption' => 'required|string|in:tls,ssl,none',
+                'smtpUsername' => 'nullable|string',
+                'smtpPassword' => 'nullable|string',
+                'smtpTimeout' => 'nullable|numeric',
+            ], [
+                'smtpFromAddress.required' => 'From Address is required.',
+                'smtpFromAddress.email' => 'Please enter a valid email address.',
+                'smtpFromName.required' => 'From Name is required.',
+                'smtpHost.required' => 'SMTP Host is required.',
+                'smtpPort.required' => 'SMTP Port is required.',
+                'smtpPort.numeric' => 'SMTP Port must be a number.',
+                'smtpEncryption.required' => 'Encryption type is required.',
+            ]);
+
+            $settings = $this->team->emailNotificationSettings;
+
+            $settings->resend_enabled = false;
+            $settings->use_instance_email_settings = false;
+            $this->resendEnabled = false;
+            $this->useInstanceEmailSettings = false;
+
+            $settings->smtp_enabled = $this->smtpEnabled;
+            $settings->smtp_from_address = $this->smtpFromAddress;
+            $settings->smtp_from_name = $this->smtpFromName;
+            $settings->smtp_host = $this->smtpHost;
+            $settings->smtp_port = $this->smtpPort;
+            $settings->smtp_encryption = $this->smtpEncryption;
+            $settings->smtp_username = $this->smtpUsername;
+            $settings->smtp_password = $this->smtpPassword;
+            $settings->smtp_timeout = $this->smtpTimeout;
+
+            $settings->save();
+            refreshSession();
+            $this->dispatch('success', 'SMTP settings updated.');
+        } catch (\Throwable $e) {
+            $this->smtpEnabled = false;
+
+            return handleError($e);
+        }
+    }
+
+    public function submitResend()
+    {
+        try {
+            $this->resetErrorBag();
+            $this->validate([
+                'resendEnabled' => 'boolean',
+                'resendApiKey' => 'required|string',
+                'smtpFromAddress' => 'required|email',
+                'smtpFromName' => 'required|string',
+            ], [
+                'resendApiKey.required' => 'Resend API Key is required.',
+                'smtpFromAddress.required' => 'From Address is required.',
+                'smtpFromAddress.email' => 'Please enter a valid email address.',
+                'smtpFromName.required' => 'From Name is required.',
+            ]);
+            $settings = $this->team->emailNotificationSettings;
+
+            $settings->smtp_enabled = false;
+            $settings->use_instance_email_settings = false;
+            $this->smtpEnabled = false;
+            $this->useInstanceEmailSettings = false;
+
+            $settings->resend_enabled = $this->resendEnabled;
+            $settings->resend_api_key = $this->resendApiKey;
+            $settings->smtp_from_address = $this->smtpFromAddress;
+            $settings->smtp_from_name = $this->smtpFromName;
+
+            $settings->save();
+            refreshSession();
+            $this->dispatch('success', 'Resend settings updated.');
+        } catch (\Throwable $e) {
+            return handleError($e, $this);
+        }
+    }
+
     public function sendTestEmail()
     {
         try {
@@ -198,90 +328,6 @@ class Email extends Component
         }
     }
 
-    public function instantSaveInstance()
-    {
-        try {
-            $this->smtpEnabled = false;
-            $this->resendEnabled = false;
-            $this->saveModel();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSaveSmtpEnabled()
-    {
-        try {
-            $this->validate([
-                'smtpEnabled' => 'boolean',
-                'smtpFromAddress' => 'required|email',
-                'smtpFromName' => 'required|string',
-                'smtpHost' => 'required|string',
-                'smtpPort' => 'required|numeric',
-                'smtpEncryption' => 'required|string|in:tls,ssl,none',
-                'smtpUsername' => 'nullable|string',
-                'smtpPassword' => 'nullable|string',
-                'smtpTimeout' => 'nullable|numeric',
-            ], [
-                'smtpFromAddress.required' => 'From Address is required.',
-                'smtpFromAddress.email' => 'Please enter a valid email address.',
-                'smtpFromName.required' => 'From Name is required.',
-                'smtpHost.required' => 'SMTP Host is required.',
-                'smtpPort.required' => 'SMTP Port is required.',
-                'smtpPort.numeric' => 'SMTP Port must be a number.',
-                'smtpEncryption.required' => 'Encryption type is required.',
-            ]);
-            $this->resendEnabled = false;
-            $this->useInstanceEmailSettings = false;
-            $this->saveModel();
-        } catch (\Throwable $e) {
-            $this->smtpEnabled = false;
-
-            return handleError($e, $this);
-        }
-    }
-
-    public function instantSaveResend()
-    {
-        try {
-            $this->validate([
-                'resendEnabled' => 'boolean',
-                'resendApiKey' => 'required|string',
-                'smtpFromAddress' => 'required|email',
-                'smtpFromName' => 'required|string',
-            ], [
-                'resendApiKey.required' => 'Resend API Key is required.',
-                'smtpFromAddress.required' => 'From Address is required.',
-                'smtpFromAddress.email' => 'Please enter a valid email address.',
-                'smtpFromName.required' => 'From Name is required.',
-            ]);
-            $this->smtpEnabled = false;
-            $this->useInstanceEmailSettings = false;
-            $this->saveModel();
-        } catch (\Throwable $e) {
-            $this->resendEnabled = false;
-
-            return handleError($e, $this);
-        }
-    }
-
-    public function saveModel()
-    {
-        $this->syncData(true);
-        refreshSession();
-        $this->dispatch('success', 'Settings saved.');
-    }
-
-    public function submit()
-    {
-        try {
-            $this->resetErrorBag();
-            $this->saveModel();
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
     public function copyFromInstanceSettings()
     {
         $settings = instanceSettings();
@@ -313,81 +359,6 @@ class Email extends Component
         $this->dispatch('error', 'Instance SMTP/Resend settings are not enabled.');
     }
 
-    public function submitSmtp()
-    {
-        try {
-            $this->resetErrorBag();
-            $this->validate([
-                'smtpEnabled' => 'boolean',
-                'smtpFromAddress' => 'required|email',
-                'smtpFromName' => 'required|string',
-                'smtpHost' => 'required|string',
-                'smtpPort' => 'required|numeric',
-                'smtpEncryption' => 'required|string|in:tls,ssl,none',
-                'smtpUsername' => 'nullable|string',
-                'smtpPassword' => 'nullable|string',
-                'smtpTimeout' => 'nullable|numeric',
-            ], [
-                'smtpFromAddress.required' => 'From Address is required.',
-                'smtpFromAddress.email' => 'Please enter a valid email address.',
-                'smtpFromName.required' => 'From Name is required.',
-                'smtpHost.required' => 'SMTP Host is required.',
-                'smtpPort.required' => 'SMTP Port is required.',
-                'smtpPort.numeric' => 'SMTP Port must be a number.',
-                'smtpEncryption.required' => 'Encryption type is required.',
-            ]);
-
-            $settings = $this->team->emailNotificationSettings;
-
-            $settings->smtp_enabled = $this->smtpEnabled;
-            $settings->smtp_from_address = $this->smtpFromAddress;
-            $settings->smtp_from_name = $this->smtpFromName;
-            $settings->smtp_host = $this->smtpHost;
-            $settings->smtp_port = $this->smtpPort;
-            $settings->smtp_encryption = $this->smtpEncryption;
-            $settings->smtp_username = $this->smtpUsername;
-            $settings->smtp_password = $this->smtpPassword;
-            $settings->smtp_timeout = $this->smtpTimeout;
-
-            $settings->save();
-            refreshSession();
-            $this->dispatch('success', 'SMTP settings saved.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
-    public function submitResend()
-    {
-        try {
-            $this->resetErrorBag();
-            $this->validate([
-                'resendEnabled' => 'boolean',
-                'resendApiKey' => 'required|string',
-                'smtpFromAddress' => 'required|email',
-                'smtpFromName' => 'required|string',
-            ], [
-                'resendApiKey.required' => 'Resend API Key is required.',
-                'smtpFromAddress.required' => 'From Address is required.',
-                'smtpFromAddress.email' => 'Please enter a valid email address.',
-                'smtpFromName.required' => 'From Name is required.',
-            ]);
-
-            $settings = $this->team->emailNotificationSettings;
-
-            $settings->resend_enabled = $this->resendEnabled;
-            $settings->resend_api_key = $this->resendApiKey;
-            $settings->smtp_from_address = $this->smtpFromAddress;
-            $settings->smtp_from_name = $this->smtpFromName;
-
-            $settings->save();
-            refreshSession();
-            $this->dispatch('success', 'Resend settings saved.');
-        } catch (\Throwable $e) {
-            return handleError($e, $this);
-        }
-    }
-
     public function render()
     {
         return view('livewire.notifications.email');

resources/views/livewire/notifications/email.blade.php

@@ -9,11 +9,6 @@
                 <x-forms.button type="submit">
                     Save
                 </x-forms.button>
-                @if (isInstanceAdmin() && !$useInstanceEmailSettings)
-                <x-forms.button wire:click='copyFromInstanceSettings'>
-                    Copy from Instance Settings
-                </x-forms.button>
-                @endif
                 @if ($team->isNotificationEnabled('email') && auth()->user()->isAdminFromSession())
                 <x-modal-input buttonTitle="Send Test Email" title="Send Test Email">
                     <form wire:submit.prevent="sendTestEmail" class="flex flex-col w-full gap-2">
@@ -24,10 +19,15 @@
                     </form>
                 </x-modal-input>
                 @endif
+                @if (isInstanceAdmin() && !$useInstanceEmailSettings)
+                <x-forms.button wire:click='copyFromInstanceSettings'>
+                    Copy from Instance Settings
+                </x-forms.button>
+                @endif
             </div>
             @if (!isCloud())
             <div class="w-96">
-                <x-forms.checkbox instantSave="instantSaveInstance" id="useInstanceEmailSettings" label="Use system wide (transactional) email settings" />
+                <x-forms.checkbox instantSave="instantSave()" id="useInstanceEmailSettings" label="Use system wide (transactional) email settings" />
             </div>
             @endif
             @if (!$useInstanceEmailSettings)
@@ -39,7 +39,7 @@
         </form>
         @if (isCloud())
         <div class="w-64 py-4">
-            <x-forms.checkbox instantSave="instantSaveInstance" id="useInstanceEmailSettings" label="Use Hosted Email Service" />
+            <x-forms.checkbox instantSave="instantSave()" id="useInstanceEmailSettings" label="Use Hosted Email Service" />
         </div>
         @endif
         @if (!$useInstanceEmailSettings)
@@ -52,7 +52,7 @@
                     </x-forms.button>
                 </div>
                 <div class="w-32">
-                    <x-forms.checkbox instantSave="instantSaveSmtpEnabled" id="smtpEnabled" label="Enabled" />
+                    <x-forms.checkbox wire:model="smtpEnabled" instantSave="instantSave('SMTP')" id="smtpEnabled" label="Enabled" />
                 </div>
                 <div class="flex flex-col">
                     <div class="flex flex-col gap-4">
@@ -81,7 +81,7 @@
                     </x-forms.button>
                 </div>
                 <div class="w-32">
-                    <x-forms.checkbox instantSave='instantSaveResend' id="resendEnabled" label="Enabled" />
+                    <x-forms.checkbox wire:model="resendEnabled" instantSave="instantSave('Resend')" id="resendEnabled" label="Enabled" />
                 </div>
                 <div class="flex flex-col">
                     <div class="flex flex-col gap-4">