show error message when wrong workflow id (#3474)

calcom · Jul 21, 2022 · c500952 · c500952
1 parent 0a336df
commit c500952
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 8 deletions.
diff --git a/apps/web/ee/pages/workflows/[workflow].tsx b/apps/web/ee/pages/workflows/[workflow].tsx
@@ -78,6 +78,8 @@ function WorkflowPage() {
 
   const {
     data: workflow,
+    isError,
+    error,
     isLoading,
     dataUpdatedAt,
   } = trpc.useQuery([
@@ -153,15 +155,21 @@ function WorkflowPage() {
           <Alert className="border " severity="warning" title={t("pro_feature_workflows")} />
         ) : (
           <>
-            {isAllDataLoaded ? (
-              <WorkflowDetailsPage
-                form={form}
-                workflowId={+workflowId}
-                selectedEventTypes={selectedEventTypes}
-                setSelectedEventTypes={setSelectedEventTypes}
-              />
+            {!isError ? (
+              <>
+                {isAllDataLoaded ? (
+                  <WorkflowDetailsPage
+                    form={form}
+                    workflowId={+workflowId}
+                    selectedEventTypes={selectedEventTypes}
+                    setSelectedEventTypes={setSelectedEventTypes}
+                  />
+                ) : (
+                  <Loader />
+                )}
+              </>
             ) : (
-              <Loader />
+              <Alert severity="error" title="Something went wrong" message={error.message} />
             )}
           </>
         )}

diff --git a/apps/web/server/routers/viewer/workflows.tsx b/apps/web/server/routers/viewer/workflows.tsx
@@ -82,6 +82,11 @@ export const workflowsRouter = createProtectedRouter()
           },
         },
       });
+      if (!workflow) {
+        throw new TRPCError({
+          code: "UNAUTHORIZED",
+        });
+      }
       return workflow;
     },
   })