From 259fea916a528343a04461e4028e8186858519b2 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Thu, 27 Jul 2023 15:01:15 -0700 Subject: [PATCH 1/4] add window alert for saveWorkflow error --- next/src/pages/workflow/[workflow].tsx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/next/src/pages/workflow/[workflow].tsx b/next/src/pages/workflow/[workflow].tsx index 9f4e6ecd18..2fb55ca181 100644 --- a/next/src/pages/workflow/[workflow].tsx +++ b/next/src/pages/workflow/[workflow].tsx @@ -1,6 +1,7 @@ import type { GetServerSideProps } from "next"; import { type NextPage } from "next"; import { useRouter } from "next/router"; +import { useState } from "react"; import { serverSideTranslations } from "next-i18next/serverSideTranslations"; import { FaSave } from "react-icons/fa"; @@ -18,6 +19,15 @@ const WorkflowPage: NextPage = () => { const { session } = useAuth({ protectedRoute: true }); const { query } = useRouter(); + const handleClick = () => { + saveWorkflow().catch((error) => { + if (error) { + window.alert('Error: ' + error.message); + } + }); + }; + + const { nodesModel, edgesModel, selectedNode, saveWorkflow, createNode, updateNode, members } = useWorkflow(query.workflow as string, session); @@ -53,9 +63,7 @@ const WorkflowPage: NextPage = () => {
} - onClick={() => { - saveWorkflow().catch(console.error); - }} + onClick={handleClick} > Save From 4ddff93dfb79803150deeacb5768365f02282a15 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Thu, 27 Jul 2023 16:07:32 -0700 Subject: [PATCH 2/4] fix json error bug --- next/src/pages/workflow/[workflow].tsx | 13 +++++++++---- next/src/services/workflow/workflowApi.ts | 2 +- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/next/src/pages/workflow/[workflow].tsx b/next/src/pages/workflow/[workflow].tsx index 2fb55ca181..cf261da35d 100644 --- a/next/src/pages/workflow/[workflow].tsx +++ b/next/src/pages/workflow/[workflow].tsx @@ -19,12 +19,17 @@ const WorkflowPage: NextPage = () => { const { session } = useAuth({ protectedRoute: true }); const { query } = useRouter(); - const handleClick = () => { - saveWorkflow().catch((error) => { + const handleClick = async () => { + try { + await saveWorkflow(); + window.alert('Workflow saved successfully!'); + } catch (error) { if (error) { - window.alert('Error: ' + error.message); + window.alert('An error occurred while saving the workflow. ' + error); + } else { + window.alert('An error occurred while saving the workflow.'); } - }); + } }; diff --git a/next/src/services/workflow/workflowApi.ts b/next/src/services/workflow/workflowApi.ts index dce6139f3e..683026ab4f 100644 --- a/next/src/services/workflow/workflowApi.ts +++ b/next/src/services/workflow/workflowApi.ts @@ -47,7 +47,7 @@ export default class WorkflowApi { async update(id: string, data: Workflow) { return await put( `/api/workflow/${id}`, - PresignedPostSchema, + z.any(), data, this.accessToken, this.organizationId From 1c4a3d9df8c4977f3b8fc893f57a339dd6ab920e Mon Sep 17 00:00:00 2001 From: Rishabh Date: Thu, 27 Jul 2023 16:20:48 -0700 Subject: [PATCH 3/4] zod return actual error --- next/src/services/fetch-utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/next/src/services/fetch-utils.ts b/next/src/services/fetch-utils.ts index 96e58ada29..b00d8e4010 100644 --- a/next/src/services/fetch-utils.ts +++ b/next/src/services/fetch-utils.ts @@ -65,7 +65,7 @@ export const put = async ( }); if (!response.ok) { - throw new Error("Request failed"); + throw new Error(response.statusText); } // eslint-disable-next-line @typescript-eslint/no-unsafe-return From f0f23c195570e91312ce2ac0cf67651ad537a968 Mon Sep 17 00:00:00 2001 From: Rishabh Date: Thu, 27 Jul 2023 16:25:28 -0700 Subject: [PATCH 4/4] make catch more concise --- next/src/pages/workflow/[workflow].tsx | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/next/src/pages/workflow/[workflow].tsx b/next/src/pages/workflow/[workflow].tsx index cf261da35d..63ec22540f 100644 --- a/next/src/pages/workflow/[workflow].tsx +++ b/next/src/pages/workflow/[workflow].tsx @@ -1,7 +1,6 @@ import type { GetServerSideProps } from "next"; import { type NextPage } from "next"; import { useRouter } from "next/router"; -import { useState } from "react"; import { serverSideTranslations } from "next-i18next/serverSideTranslations"; import { FaSave } from "react-icons/fa"; @@ -24,11 +23,7 @@ const WorkflowPage: NextPage = () => { await saveWorkflow(); window.alert('Workflow saved successfully!'); } catch (error) { - if (error) { - window.alert('An error occurred while saving the workflow. ' + error); - } else { - window.alert('An error occurred while saving the workflow.'); - } + window.alert('An error occurred while saving the workflow. ' + error); } };