feat: add error toasts

Signed-off-by: Lin Wang <[email protected]>
opensearch-project · Dec 6, 2023 · 6c5f87d · 6c5f87d
1 parent 3937bb6
commit 6c5f87d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 7 deletions.
diff --git a/public/components/edit_conversation_name_modal.tsx b/public/components/edit_conversation_name_modal.tsx
@@ -26,7 +26,7 @@ export const EditConversationNameModal = ({
     },
   } = useCore();
   const titleInputRef = useRef<HTMLInputElement>(null);
-  const { loading, abort, patchSession } = usePatchSession();
+  const { loading, abort, patchSession, isAborted } = usePatchSession();
 
   const handleCancel = useCallback(() => {
     abort();
@@ -41,11 +41,15 @@ export const EditConversationNameModal = ({
       await patchSession(sessionId, title);
       toasts.addSuccess('This conversation was successfully updated.');
     } catch (_e) {
+      if (isAborted()) {
+        return;
+      }
       onClose?.('errored');
+      toasts.addDanger('There was an error. The name failed to update.');
       return;
     }
     onClose?.('updated', title);
-  }, [onClose, sessionId, patchSession, toasts.addSuccess]);
+  }, [onClose, sessionId, patchSession, toasts.addSuccess, toasts.addDanger, isAborted]);
 
   return (
     <EuiConfirmModal

diff --git a/public/hooks/use_sessions.ts b/public/hooks/use_sessions.ts
@@ -21,8 +21,13 @@ export const useDeleteSession = () => {
         .delete(`${ASSISTANT_API.SESSION}/${sessionId}`, {
           signal: abortControllerRef.current.signal,
         })
-        .then((payload) => dispatch({ type: 'success', payload }))
-        .catch((error) => dispatch({ type: 'failure', error }));
+        .then((payload) => {
+          dispatch({ type: 'success', payload });
+        })
+        .catch((error) => {
+          dispatch({ type: 'failure', error });
+          throw error;
+        });
     },
     [core.services.http]
   );
@@ -31,9 +36,12 @@ export const useDeleteSession = () => {
     abortControllerRef.current?.abort();
   }, []);
 
+  const isAborted = useCallback(() => !!abortControllerRef.current?.signal.aborted, []);
+
   return {
     ...state,
     abort,
+    isAborted,
     deleteSession,
   };
 };
@@ -55,7 +63,10 @@ export const usePatchSession = () => {
           signal: abortControllerRef.current.signal,
         })
         .then((payload) => dispatch({ type: 'success', payload }))
-        .catch((error) => dispatch({ type: 'failure', error }));
+        .catch((error) => {
+          dispatch({ type: 'failure', error });
+          throw error;
+        });
     },
     [core.services.http]
   );
@@ -64,9 +75,12 @@ export const usePatchSession = () => {
     abortControllerRef.current?.abort();
   }, []);
 
+  const isAborted = useCallback(() => !!abortControllerRef.current?.signal.aborted, []);
+
   return {
     ...state,
     abort,
+    isAborted,
     patchSession,
   };
 };
diff --git a/public/tabs/history/delete_conversation_confirm_modal.tsx b/public/tabs/history/delete_conversation_confirm_modal.tsx
@@ -24,7 +24,7 @@ export const DeleteConversationConfirmModal = ({
       notifications: { toasts },
     },
   } = useCore();
-  const { loading, deleteSession, abort } = useDeleteSession();
+  const { loading, deleteSession, abort, isAborted } = useDeleteSession();
 
   const handleCancel = useCallback(() => {
     abort();
@@ -35,11 +35,15 @@ export const DeleteConversationConfirmModal = ({
       await deleteSession(sessionId);
       toasts.addSuccess('The conversation was successfully deleted.');
     } catch (_e) {
+      if (isAborted()) {
+        return;
+      }
       onClose?.('errored');
+      toasts.addDanger('There was an error. The conversation failed to delete.');
       return;
     }
     onClose?.('deleted');
-  }, [onClose, deleteSession, sessionId, toasts.addSuccess]);
+  }, [onClose, deleteSession, sessionId, toasts.addSuccess, toasts.addDanger, isAborted]);
 
   return (
     <EuiConfirmModal