From c94d019f67dc033937c50a8ace2ef8d7481a8622 Mon Sep 17 00:00:00 2001
From: mikigoalie <mikigoalie@seznam.cz>
Date: Mon, 1 May 2023 12:08:02 +0200
Subject: [PATCH] feat(web/notifications): add warning type (#315)

* update(notify): add warning it's own type

* update(notify): inform > info, change warning default icon to circle

* fix typo

* update(notify): case for def notifs, update icons

use circle icons for all notifs so its more unified, also looks a bit better imo

* fix(progressBar): spamming cancel

spamming cancel would sometimes not interrupt current progbar

* Revert "fix(progressBar): spamming cancel"

This reverts commit b030fddd20f9f2b92a07ce4199c73e3b43f435a3.
---
 resource/interface/client/notify.lua          |  4 ++--
 .../notifications/NotificationWrapper.tsx     | 20 +++++++++++++++----
 2 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/resource/interface/client/notify.lua b/resource/interface/client/notify.lua
index 55db59e..2cfb826 100644
--- a/resource/interface/client/notify.lua
+++ b/resource/interface/client/notify.lua
@@ -1,5 +1,5 @@
 ---@alias NotificationPosition 'top' | 'top-right' | 'top-left' | 'bottom' | 'bottom-right' | 'bottom-left' | 'center-right' | 'center-left'
----@alias NotificationType 'inform' | 'error' | 'success'
+---@alias NotificationType 'info' | 'warning' | 'success' | 'error'
 
 ---@class NotifyProps
 ---@field id? string
@@ -32,7 +32,7 @@ end
 function lib.defaultNotify(data)
     -- Backwards compat for v3 
     data.type = data.status
-    if data.type == 'info' or data.type == 'warning' then data.type = 'inform' end
+    if data.type == 'inform' then data.type = 'info' end
     return lib.notify(data)
 end
 
diff --git a/web/src/features/notifications/NotificationWrapper.tsx b/web/src/features/notifications/NotificationWrapper.tsx
index b64ad86..c63cc57 100644
--- a/web/src/features/notifications/NotificationWrapper.tsx
+++ b/web/src/features/notifications/NotificationWrapper.tsx
@@ -118,9 +118,21 @@ const Notifications: React.FC = () => {
         break;
     }
     if (!data.icon) {
-      data.icon = data.type === 'error' ? 'xmark' : data.type === 'success' ? 'check' : 'info';
-    }
-
+      switch (data.type) {
+        case 'error':
+          data.icon = 'circle-xmark';
+          break;
+        case 'success':
+          data.icon = 'circle-check';
+          break;
+        case 'warning':
+          data.icon = 'circle-exclamation';
+          break;
+        default:           
+          data.icon = 'circle-info';
+          break;
+      }
+    } 
     toast.custom(
       (t) => (
         <Box
@@ -147,7 +159,7 @@ const Notifications: React.FC = () => {
               <>
                 {!data.iconColor ? (
                   <Avatar
-                    color={data.type === 'error' ? 'red' : data.type === 'success' ? 'teal' : 'blue'}
+                    color={data.type === 'error' ? 'red' : data.type === 'success' ? 'teal' : data.type === 'warning' ? 'yellow' : 'blue'}
                     radius="xl"
                     size={32}
                   >