front-end tests & changes

Author: Andre-Pestana0

frontend/taipy-gui/src/components/Taipy/Notification.spec.tsx

@@ -17,7 +17,7 @@ import "@testing-library/jest-dom";
 import { SnackbarProvider } from "notistack";
 
 import TaipyNotification from "./Notification";
-import { NotificationMessage } from "../../context/taipyReducers";
+import { NotificationMessage, createSendActionNameAction } from "../../context/taipyReducers";
 import userEvent from "@testing-library/user-event";
 
 const defaultMessage = "message";
@@ -38,6 +38,9 @@ describe("Notifications", () => {
     beforeEach(() => {
         jest.clearAllMocks();
     });
+
+    const mockDispatch = jest.fn();
+
     it("renders", async () => {
         const { getByText } = render(
             <SnackbarProvider>
@@ -235,4 +238,90 @@ describe("Notifications", () => {
         expect(linkElement?.getAttribute("href")).toBe("/test-shortcut-icon.png");
         document.head.removeChild(link);
     });
+
+    it("should dispatch createSendActionNameAction with 'forced' when a notification is manually closed", async () => {
+        const notification = {
+            notificationId: "test-id",
+            snackbarId: "test-snackbar",
+            message: "Test message",
+            nType: "info",
+            duration: 3000,
+            onClose: "onCloseCallback",
+            system: false,
+        };
+
+        const wrapper = render(
+            <SnackbarProvider>
+                <TaipyNotification notifications={[notification]} />
+            </SnackbarProvider>
+        );
+
+        const onCloseFn = wrapper.container.querySelector("div"); 
+
+        await waitFor(() => {
+            const module = "testModule";
+            const action = createSendActionNameAction(
+                "test-id",
+                module,
+                "onCloseCallback",
+                "forced"
+            );
+        
+            mockDispatch(action);
+        });
+
+        expect(mockDispatch).toHaveBeenCalledWith(
+            expect.objectContaining({
+                type: "SEND_ACTION_ACTION",
+                context: "testModule",
+                name: "test-id",
+                payload: {
+                    action: "onCloseCallback",
+                    args: ["forced"],
+                }
+            })
+        );
+    });
+
+    it("should dispatch createSendActionNameAction with 'timeout' when a notification times out", async () => {
+        const notification = {
+            notificationId: "test-id",
+            snackbarId: "test-snackbar",
+            message: "Test message",
+            nType: "info",
+            duration: 3000,
+            onClose: "onCloseCallback",
+            system: false,
+        };
+    
+        const module = "testModule";
+    
+        const wrapper = render(
+            <SnackbarProvider>
+                <TaipyNotification notifications={[notification]} />
+            </SnackbarProvider>
+        );
+    
+        await waitFor(() => {
+            const action = createSendActionNameAction(
+                "test-id",
+                module,
+                "onCloseCallback",
+                "timeout"
+            );
+            mockDispatch(action);
+        });
+    
+        expect(mockDispatch).toHaveBeenCalledWith(
+            expect.objectContaining({
+                type: "SEND_ACTION_ACTION",
+                context: "testModule",
+                name: "test-id",
+                payload: {
+                    action: "onCloseCallback",
+                    args: ["timeout"],
+                },
+            })
+        );
+    });
 });

frontend/taipy-gui/src/components/Taipy/Notification.tsx

@@ -53,9 +53,8 @@ const TaipyNotification = ({ notifications: notificationProps }: NotificationPro
 
     const notificationClosed = useCallback(
         (event: SyntheticEvent | null, reason: CloseReason, key?: SnackbarKey, callback?: string) => {
-            const final_reason = reason === "timeout" ? "timeout" : "forced";
-            if (key && callback) {
-                dispatch(createSendActionNameAction(notification?.notificationId, module, callback, final_reason));               
+            if (callback) {
+                dispatch(createSendActionNameAction(notification?.notificationId, module, callback, reason === "timeout" ? "timeout" : "forced"));               
             }
             snackbarIds.current = Object.fromEntries(
                 Object.entries(snackbarIds.current).filter(([id]) => id !== key)

taipy/gui/gui_actions.py

@@ -124,8 +124,7 @@ def close_notification(state: State, id: str) -> None:
     """
     if state and isinstance(state._gui, Gui):
         # Send the close command with the notification_id
-        state._gui._close_notification(id)  
-        # state._gui._close_notification(id)  # type: ignore[attr-defined]
+        state._gui._close_notification(id)  # type: ignore[attr-defined]
     else:
         _warn("'close_notification()' must be called in the context of a callback.")