Keep source forms on local error messages

Rhys Sullivan committed 6 months ago

Commit 2256b0c1 parent dfda4fb2 files · +28 −36Browse files

Unified · Split

2 files

packages/plugins/graphql/src/react/AddGraphqlSource.tsx +12 −8
packages/plugins/mcp/src/react/AddMcpSource.tsx +16 −28

packages/plugins/graphql/src/react/AddGraphqlSource.tsx+12−8

 import { useCallback, useState } from "react";
 import { useAtomSet } from "@effect/atom-react";
 import * as Exit from "effect/Exit";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
-import { useErrorMessageFromExit } from "@executor-js/react/api/error-reporting";
 import { useScope } from "@executor-js/react/api/scope-context";
 import { sourceWriteKeys } from "@executor-js/react/api/reactivity-keys";
 import {
 import { initialGraphqlCredentials } from "./defaults";
 import type { GraphqlCredentialInput } from "../sdk/types";
+const ErrorMessage = Schema.Struct({ message: Schema.String });
+const decodeErrorMessage = Schema.decodeUnknownOption(ErrorMessage);
+const errorMessageFromExit = (exit: Exit.Exit<unknown, unknown>, fallback: string): string =>
+  Option.match(Option.flatMap(Exit.findErrorOption(exit), decodeErrorMessage), {
+    onNone: () => fallback,
+    onSome: ({ message }) => message,
+  });
 type AuthMode = "none" | "oauth2";
 export default function AddGraphqlSource(props: {
   const [addError, setAddError] = useState<string | null>(null);
   const [authMode, setAuthMode] = useState<AuthMode>("none");
   const [tokens, setTokens] = useState<OAuthCompletionPayload | null>(null);
-  const errorMessageFromExit = useErrorMessageFromExit();
   const scopeId = useScope();
   const { credentialTargetScope: requestCredentialTargetScope } = useCredentialTargetScope();
       reactivityKeys: sourceWriteKeys,
     });
     if (Exit.isFailure(exit)) {
-      setAddError(
+      setAddError(errorMessageFromExit(exit, "Failed to add source"));
-        errorMessageFromExit(exit, "Failed to add source", {
-          surface: "graphql_source",
-          action: "add_source",
-        }),
-      );
       setAdding(false);
       return;
     }

packages/plugins/mcp/src/react/AddMcpSource.tsx+16−28

 import { useReducer, useCallback, useEffect, useRef, useState, type ReactNode } from "react";
 import { useAtomSet } from "@effect/atom-react";
 import * as Exit from "effect/Exit";
+import * as Option from "effect/Option";
+import * as Schema from "effect/Schema";
-import { useErrorMessageFromExit } from "@executor-js/react/api/error-reporting";
 import { useScope } from "@executor-js/react/api/scope-context";
 import { Button } from "@executor-js/react/components/button";
 import {
 import { mcpPresets, type McpPreset } from "../sdk/presets";
 import { MCP_OAUTH_CONNECTION_SLOT, type McpCredentialInput } from "../sdk/types";
+const ErrorMessage = Schema.Struct({ message: Schema.String });
+const decodeErrorMessage = Schema.decodeUnknownOption(ErrorMessage);
+const errorMessageFromExit = (exit: Exit.Exit<unknown, unknown>, fallback: string): string =>
+  Option.match(Option.flatMap(Exit.findErrorOption(exit), decodeErrorMessage), {
+    onNone: () => fallback,
+    onSome: ({ message }) => message,
+  });
 // ---------------------------------------------------------------------------
 // Preset lookup
 // ---------------------------------------------------------------------------
   const doAdd = useAtomSet(addMcpSourceOptimistic(scopeId), {
     mode: "promiseExit",
   });
-  const errorMessageFromExit = useErrorMessageFromExit();
   const secretList = useSecretPickerSecrets();
   const oauth = useOAuthPopupFlow<OAuthCompletionPayload>({
     popupName: "mcp-oauth",
     if (Exit.isFailure(exit)) {
       dispatch({
         type: "probe-fail",
-        error: errorMessageFromExit(exit, "Failed to connect", {
+        error: errorMessageFromExit(exit, "Failed to connect"),
-          surface: "mcp_source",
-          action: "probe_remote_source",
-        }),
       });
       return;
     }
     setRemoteAuthMode(exit.value.requiresOAuth ? "oauth2" : "none");
     dispatch({ type: "probe-ok", probe: exit.value });
-  }, [state.url, scopeId, doProbe, remoteCredentials, errorMessageFromExit]);
+  }, [state.url, scopeId, doProbe, remoteCredentials]);
   // Keep the latest handleProbe in a ref so the debounced effect can call it
   // without depending on its identity (which changes every render).
     if (Exit.isFailure(exit)) {
       dispatch({
         type: "add-fail",
-        error: errorMessageFromExit(exit, "Failed to add source", {
+        error: errorMessageFromExit(exit, "Failed to add source"),
-          surface: "mcp_source",
-          action: "add_remote_source",
-        }),
       });
       return;
     }
     doAdd,
     props,
     scopeId,
-    errorMessageFromExit,
     requestCredentialTargetScope,
     oauthCredentialTargetScope,
   ]);
       reactivityKeys: sourceWriteKeys,
     });
     if (Exit.isFailure(exit)) {
-      setStdioError(
+      setStdioError(errorMessageFromExit(exit, "Failed to add source"));
-        errorMessageFromExit(exit, "Failed to add source", {
-          surface: "mcp_source",
-          action: "add_stdio_source",
-        }),
-      );
       setStdioAdding(false);
       return;
     }
     props.onComplete();
-  }, [
+  }, [stdioCommand, stdioArgs, stdioEnv, stdioIdentity, doAdd, scopeId, props]);
-    stdioCommand,
-    stdioArgs,
-    stdioEnv,
-    stdioIdentity,
-    doAdd,
-    scopeId,
-    props,
-    errorMessageFromExit,
-  ]);
   // ---- Render ----