Merge pull request #275 from Tauffer-Consulting/dev

Dev
Tauffer-Consulting · Apr 9, 2024 · fe9c939 · fe9c939
2 parents 11ef677 + ab58da8
commit fe9c939
Show file tree

Hide file tree

Showing 31 changed files with 383 additions and 35 deletions.
diff --git a/frontend/src/features/auth/api/useAuthLogin.ts b/frontend/src/features/auth/api/useAuthLogin.ts
@@ -1,5 +1,7 @@
 import { type MutationConfig } from "@services/clients/react-query.client";
 import { useMutation } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface LoginParams {
@@ -20,6 +22,14 @@ export const useAuthLogin = (
   return useMutation({
     mutationFn: async ({ email, password }) =>
       await postAuthLogin({ email, password }),
+    onError: (e: AxiosError<{ message: string }>) => {
+      const message =
+        (e.response?.data?.message ?? e?.message) || "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/auth/api/useAuthRegister.ts b/frontend/src/features/auth/api/useAuthRegister.ts
@@ -1,5 +1,7 @@
 import { type MutationConfig } from "@services/clients/react-query.client";
 import { useMutation } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface RegisterParams {
@@ -19,6 +21,14 @@ export const useAuthRegister = (
 ) => {
   return useMutation({
     mutationFn: async (params) => await postAuthRegister(params),
+    onError: (e: AxiosError<{ message: string }>) => {
+      const message =
+        (e.response?.data?.message ?? e?.message) || "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useRunReport.ts b/frontend/src/features/myWorkflows/api/runs/useRunReport.ts
@@ -1,6 +1,8 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { skipToken, useQuery } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type taskState } from "features/myWorkflows/types";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface WorkflowRunReportParams {
@@ -34,6 +36,18 @@ export const useRunReport = (
       ? async () =>
           await getWorkflowRunReport({ runId, workflowId, workspaceId })
       : skipToken,
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useRunTaskLogs.ts b/frontend/src/features/myWorkflows/api/runs/useRunTaskLogs.ts
@@ -1,5 +1,7 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { skipToken, useQuery } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface RunTaskLogsParams {
@@ -37,14 +39,37 @@ export const useRunTaskLogs = (
     queryFn:
       !workspaceId || !workflowId || !runId || !taskId || !taskTryNumber
         ? skipToken
-        : async () =>
-            await getWorkflowRunTaskLogs({
-              workspaceId,
-              workflowId,
-              runId,
-              taskId,
-              taskTryNumber,
-            }),
+        : async () => {
+            try {
+              return await getWorkflowRunTaskLogs({
+                workspaceId,
+                workflowId,
+                runId,
+                taskId,
+                taskTryNumber,
+              });
+            } catch (e) {
+              console.log(e);
+              throw e;
+            }
+          },
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      if (e.response?.status === 404) {
+        console.log("Logs not found");
+        return false;
+      }
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useRunTaskResult.ts b/frontend/src/features/myWorkflows/api/runs/useRunTaskResult.ts
@@ -1,5 +1,7 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { skipToken, useQuery } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 export interface WorkflowRunTaskResultParams {
@@ -32,14 +34,32 @@ export const useRunTaskResult = (
     queryFn:
       !runId || !taskId || !taskTryNumber || !workflowId || !workspaceId
         ? skipToken
-        : async () =>
-            await getWorkflowRunTaskResult({
+        : async () => {
+            return await getWorkflowRunTaskResult({
               runId,
               taskId,
               taskTryNumber,
               workflowId,
               workspaceId,
-            }),
+            });
+          },
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      if (e?.response?.status === 404) {
+        console.log("Results not found");
+        return false;
+      }
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useRunTasks.ts b/frontend/src/features/myWorkflows/api/runs/useRunTasks.ts
@@ -1,6 +1,8 @@
 import { type IWorkflowRunTasks } from "@features/myWorkflows/types";
 import { type InfiniteQueryConfig } from "@services/clients/react-query.client";
 import { useInfiniteQuery } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface WorkflowRunTasksParams {
@@ -39,6 +41,18 @@ export const useRunTasks = (
     enabled: !!(workspaceId && workflowId && runId),
     getNextPageParam: (res, _, page) =>
       (res.metadata?.last_page ?? 0) > page ? page + 1 : null,
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useRuns.ts b/frontend/src/features/myWorkflows/api/runs/useRuns.ts
@@ -1,6 +1,8 @@
 import { type IWorkflowRuns } from "@features/myWorkflows/types";
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { skipToken, useQuery } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface WorkflowRunParams {
@@ -26,6 +28,18 @@ export const useRuns = (
         ? skipToken
         : async () =>
             await getWorkflowRuns({ workspaceId, workflowId, page, pageSize }),
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/runs/useStartRun.ts b/frontend/src/features/myWorkflows/api/runs/useStartRun.ts
@@ -1,6 +1,8 @@
 import { type MutationConfig } from "@services/clients/react-query.client";
 import { useMutation } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type IPostWorkflowRunIdResponseInterface } from "features/myWorkflows/types/workflow";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface StartRunParams {
@@ -23,6 +25,14 @@ export const useStartRun = (
       if (!workflowId) throw new Error("no workspace selected");
       return await postWorkflowRunId({ workflowId, workspaceId });
     },
+    onError: (e: AxiosError<{ detail: string }>) => {
+      const message =
+        (e.response?.data?.detail ?? e?.message) || "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/workflow/useDeleteWorkflow.ts b/frontend/src/features/myWorkflows/api/workflow/useDeleteWorkflow.ts
@@ -1,6 +1,8 @@
 import { type MutationConfig } from "@services/clients/react-query.client";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type IDeleteWorkflowIdResponseInterface } from "features/myWorkflows/types/workflow";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface DeleteWorkflowParams {
@@ -30,6 +32,14 @@ export const useDeleteWorkflow = (
         queryKey: ["WORKFLOW", workspaceId, workflowId],
       });
     },
+    onError: (e: AxiosError<{ detail: string }>) => {
+      const message =
+        (e.response?.data?.detail ?? e?.message) || "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/workflow/useWorkflow.ts b/frontend/src/features/myWorkflows/api/workflow/useWorkflow.ts
@@ -1,6 +1,8 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { useQuery, skipToken } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type IGetWorkflowIdResponseInterface } from "features/myWorkflows/types/workflow";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface GetWorkflowByIdParams {
@@ -18,6 +20,18 @@ export const useWorkflow = (
       workspaceId && workflowId
         ? async () => await getWorkflowById({ workflowId, workspaceId })
         : skipToken,
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/myWorkflows/api/workflow/useWorkflows.ts b/frontend/src/features/myWorkflows/api/workflow/useWorkflows.ts
@@ -1,6 +1,8 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { useQuery, skipToken } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type IGetWorkflowResponseInterface } from "features/myWorkflows/types/workflow";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface GetWorkflowsParams {
@@ -18,6 +20,18 @@ export const useWorkflows = (
     queryFn: workspaceId
       ? async () => await getWorkflows({ workspaceId, page, pageSize })
       : skipToken,
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/workflowEditor/api/workflow/useCreateWorkflow.ts b/frontend/src/features/workflowEditor/api/workflow/useCreateWorkflow.ts
@@ -1,7 +1,9 @@
 import { type MutationConfig } from "@services/clients/react-query.client";
 import { useMutation, useQueryClient } from "@tanstack/react-query";
+import { type AxiosError } from "axios";
 import { type IPostWorkflowResponseInterface } from "features/myWorkflows/types";
 import { type CreateWorkflowRequest } from "features/workflowEditor/context/types";
+import { toast } from "react-toastify";
 import { dominoApiClient } from "services/clients/domino.client";
 
 interface UsePostWorkflow {
@@ -27,6 +29,14 @@ export const useCreateWorkflow = (
         queryKey: ["WORKFLOWS", workspaceId],
       });
     },
+    onError: (e: AxiosError<{ detail: string }>) => {
+      const message =
+        (e.response?.data?.detail ?? e?.message) || "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+    },
     ...config,
   });
 };

diff --git a/frontend/src/features/workflowEditor/api/workflowsExample/getWorkflowExamples.ts b/frontend/src/features/workflowEditor/api/workflowsExample/getWorkflowExamples.ts
@@ -1,7 +1,8 @@
 import { type QueryConfig } from "@services/clients/react-query.client";
 import { useQuery, skipToken } from "@tanstack/react-query";
-import axios from "axios";
+import axios, { type AxiosError } from "axios";
 import { type WorkflowPieceData } from "features/workflowEditor/context/types";
+import { toast } from "react-toastify";
 import { type Edge, type Node } from "reactflow";
 
 interface JSONFile {
@@ -25,6 +26,18 @@ export const useWorkflowsExamples = (
   return useQuery({
     queryKey: ["WORKFLOWS-EXAMPLES"],
     queryFn: fetch ? async () => await getWorkflowsExample() : skipToken,
+    throwOnError(e, _query) {
+      const message =
+        ((e as AxiosError<{ detail?: string }>).response?.data?.detail ??
+          e?.message) ||
+        "Something went wrong";
+
+      toast.error(message, {
+        toastId: message,
+      });
+
+      return false;
+    },
     ...config,
   });
 };