client: Add toast for edit notification channel popup

Magpie-Monitor · Nov 30, 2024 · 3e33d28 · 3e33d28
1 parent bb6108a
commit 3e33d28
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 15 deletions.
diff --git a/client/src/pages/Notification/EditChannelPopup/EditDiscordChannelPopup.tsx b/client/src/pages/Notification/EditChannelPopup/EditDiscordChannelPopup.tsx
@@ -16,6 +16,7 @@ import LabelInput, {
 import NewChannelPopupHeader from 'pages/Notification/NewChannelPopupHeader/NewChannelPopupHeader';
 import { EditChannelPopupProps } from './EditChannelPopup';
 import { discordWebhookValidation } from 'lib/validators';
+import { useToast } from 'providers/ToastProvider/ToastProvider';
 
 interface EditDiscordChannelPopupProps extends EditChannelPopupProps {
   id: string;
@@ -37,6 +38,8 @@ const EditDiscordChannelPopup = ({
     webhookUrl: '',
   });
 
+  const { showMessage } = useToast();
+
   const editDiscordChannel = async () => {
     if (
       discordChannel.name === name &&
@@ -46,12 +49,14 @@ const EditDiscordChannelPopup = ({
 
     try {
       await ManagmentServiceApiInstance.editDiscordChannel(discordChannel);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('Error posting slack channels: ', error);
-    } finally {
       setIsDisplayed(false);
       onSubmit();
+      showMessage({ message: 'Channel was updated', type: 'INFO' });
+    } catch (error) {
+      showMessage({
+        message: `Failed to update channel ${error}`,
+        type: 'ERROR',
+      });
     }
   };
 

diff --git a/client/src/pages/Notification/EditChannelPopup/EditEmailChannelPopup.tsx b/client/src/pages/Notification/EditChannelPopup/EditEmailChannelPopup.tsx
@@ -16,6 +16,7 @@ import LabelInput, {
 import NewChannelPopupHeader from 'pages/Notification/NewChannelPopupHeader/NewChannelPopupHeader';
 import { EditChannelPopupProps } from './EditChannelPopup';
 import { emailValidation } from 'lib/validators';
+import { useToast } from 'providers/ToastProvider/ToastProvider';
 
 interface EditEmailChannelPopupProps extends EditChannelPopupProps {
   id: string;
@@ -36,18 +37,24 @@ const EditEmailChannelPopup = ({
     name,
     email,
   });
+  const { showMessage } = useToast();
 
   const editEmailChannel = async () => {
     if (emailChannel.name === name && emailChannel.email === email) return;
 
     try {
       await ManagmentServiceApiInstance.editEmailChannel(emailChannel);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('Error posting slack channels: ', error);
-    } finally {
+      showMessage({
+        message: 'Channel updated successfully',
+        type: 'INFO',
+      });
       onSubmit();
       setIsDisplayed(false);
+    } catch (error) {
+      showMessage({
+        message: `Failed to update channel ${error}`,
+        type: 'ERROR',
+      });
     }
   };
 

diff --git a/client/src/pages/Notification/EditChannelPopup/EditSlackChannelPopup.tsx b/client/src/pages/Notification/EditChannelPopup/EditSlackChannelPopup.tsx
@@ -16,6 +16,7 @@ import LabelInput, {
 import NewChannelPopupHeader from 'pages/Notification/NewChannelPopupHeader/NewChannelPopupHeader';
 import { EditChannelPopupProps } from './EditChannelPopup';
 import { slackWebhookValidation } from 'lib/validators';
+import { useToast } from 'providers/ToastProvider/ToastProvider';
 
 interface EditSlackChannelPopupProps extends EditChannelPopupProps {
   id: string;
@@ -37,18 +38,25 @@ const EditSlackChannelPopup = ({
     webhookUrl: '',
   });
 
+  const { showMessage } = useToast();
+
   const editSlackChannel = async () => {
     if (slackChannel.name === name && slackChannel.webhookUrl === webhookUrl)
       return;
 
     try {
       await ManagmentServiceApiInstance.editSlackChannel(slackChannel);
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.error('Error posting slack channels: ', error);
-    } finally {
+      showMessage({
+        message: 'Channel updated successfully',
+        type: 'INFO',
+      });
       onSubmit();
       setIsDisplayed(false);
+    } catch (error) {
+      showMessage({
+        message: `Failed to update channel ${error}`,
+        type: 'ERROR',
+      });
     }
   };
 

diff --git a/client/src/pages/Notification/NotificationTable/DiscordTable.tsx b/client/src/pages/Notification/NotificationTable/DiscordTable.tsx
@@ -99,7 +99,7 @@ const DiscordTable = () => {
             try {
               await ManagmentServiceApiInstance.testDiscordChannel(props.id);
               showMessage({
-                message: 'Test notification was sent',
+                message: 'Successfully sent a test notification',
                 type: 'INFO',
               });
             } catch (e: unknown) {

diff --git a/client/src/pages/Notification/NotificationTable/EmailTable.tsx b/client/src/pages/Notification/NotificationTable/EmailTable.tsx
@@ -99,7 +99,7 @@ const EmailTable = () => {
             try {
               await ManagmentServiceApiInstance.testEmailChannel(props.id);
               showMessage({
-                message: 'Test notification was sent',
+                message: 'Successfully sent a test notification',
                 type: 'INFO',
               });
             } catch (e: unknown) {

diff --git a/client/src/pages/Notification/NotificationTable/SlackTable.tsx b/client/src/pages/Notification/NotificationTable/SlackTable.tsx
@@ -98,7 +98,7 @@ const SlackTable = () => {
             try {
               await ManagmentServiceApiInstance.testSlackChannel(props.id);
               showMessage({
-                message: 'Test notification was sent',
+                message: 'Successfully sent a test notification',
                 type: 'INFO',
               });
             } catch (e: unknown) {