From f6c3fe78883842d916818ba75d068ce9174e523c Mon Sep 17 00:00:00 2001
From: Andras Bacsai <andras.bacsai@gmail.com>
Date: Fri, 8 Sep 2023 17:26:59 +0200
Subject: [PATCH] fix: test email on for admins or custom smtp

---
 .../notifications/email-settings.blade.php    | 26 +++++++++----------
 .../views/livewire/settings/email.blade.php   | 15 ++++++-----
 2 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/resources/views/livewire/notifications/email-settings.blade.php b/resources/views/livewire/notifications/email-settings.blade.php
index d1d3b9fc4..d7acaac1a 100644
--- a/resources/views/livewire/notifications/email-settings.blade.php
+++ b/resources/views/livewire/notifications/email-settings.blade.php
@@ -21,7 +21,7 @@
                     Copy from Instance Settings
                 </x-forms.button>
             @endif
-            @if (isEmailEnabled($team) || data_get($team, 'use_instance_email_settings'))
+            @if (isEmailEnabled($team) && auth()->user()->isAdminFromSession())
                 <x-forms.button onclick="sendTestEmail.showModal()"
                     class="text-white normal-case btn btn-xs no-animation btn-primary">
                     Send Test Email
@@ -36,10 +36,10 @@
                 label="Use hosted email service" />
         </div>
     @else
-    <div class="pb-4 w-96">
-        <x-forms.checkbox disabled id="team.use_instance_email_settings"
-            label="Use hosted email service (Pro+ subscription required)" />
-    </div>
+        <div class="pb-4 w-96">
+            <x-forms.checkbox disabled id="team.use_instance_email_settings"
+                label="Use hosted email service (Pro+ subscription required)" />
+        </div>
     @endif
     @if (!$team->use_instance_email_settings)
         <form class="flex flex-col items-end gap-2 pb-4 xl:flex-row" wire:submit.prevent='submitFromFields'>
@@ -112,25 +112,23 @@
         <h2 class="mt-4">Subscribe to events</h2>
         <div class="w-64">
             @if (isDev())
-            <h3 class="mt-4">Test</h3>
-            <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Enabled" />
-            </div>
+                <h3 class="mt-4">Test</h3>
+                <div class="flex items-end gap-10">
+                    <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_test" label="Enabled" />
+                </div>
             @endif
             <h3 class="mt-4">Container Status Changes</h3>
             <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes"
-                label="Enabled" />
+                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_status_changes" label="Enabled" />
             </div>
             <h3 class="mt-4">Application Deployments</h3>
             <div class="flex items-end gap-10">
-                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments"
-                label="Enabled" />
+                <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_deployments" label="Enabled" />
             </div>
             <h3 class="mt-4">Backup Status</h3>
             <div class="flex items-end gap-10">
                 <x-forms.checkbox instantSave="saveModel" id="team.smtp_notifications_database_backups"
-                label="Enabled" />
+                    label="Enabled" />
             </div>
         </div>
     @endif
diff --git a/resources/views/livewire/settings/email.blade.php b/resources/views/livewire/settings/email.blade.php
index 3350541e5..0f7fd65bf 100644
--- a/resources/views/livewire/settings/email.blade.php
+++ b/resources/views/livewire/settings/email.blade.php
@@ -22,12 +22,12 @@
             <x-forms.button type="submit">
                 Save
             </x-forms.button>
-            @if ($settings->resend_enabled || $settings->smtp_enabled)
-            <x-forms.button onclick="sendTestEmail.showModal()"
-                class="text-white normal-case btn btn-xs no-animation btn-primary">
-                Send Test Email
-            </x-forms.button>
-        @endif
+            @if (isEmailEnabled($settings))
+                <x-forms.button onclick="sendTestEmail.showModal()"
+                    class="text-white normal-case btn btn-xs no-animation btn-primary">
+                    Send Test Email
+                </x-forms.button>
+            @endif
         </div>
     </form>
     <div class="flex flex-col gap-4">
@@ -74,7 +74,8 @@
                 <form wire:submit.prevent='submitResend' class="flex flex-col">
                     <div class="flex flex-col gap-4">
                         <div class="flex flex-col w-full gap-2 xl:flex-row">
-                            <x-forms.input type="password" id="settings.resend_api_key" placeholder="API key" label="Host" />
+                            <x-forms.input type="password" id="settings.resend_api_key" placeholder="API key"
+                                label="Host" />
                         </div>
                     </div>
                     <div class="flex justify-end gap-4 pt-6">