Show errors in filing issues/PRs

cognitive-engineering-lab · Sep 11, 2024 · 2e763f5 · 2e763f5
1 parent ee6995f
commit 2e763f5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/js/packages/repo-quest/src/index.tsx b/js/packages/repo-quest/src/index.tsx
@@ -9,6 +9,7 @@ import {
   events,
   type QuestConfig,
   type QuestState,
+  type Result,
   type Stage,
   type StageState,
   type StateDescriptor,
@@ -88,6 +89,17 @@ let ErrorView: React.FC<{ message: string; action: string }> = ({
   return null;
 };
 
+async function tryAwait<T>(
+  promise: Promise<Result<T, string>>,
+  action: string,
+  setMessage: (message: ErrorMessage) => void
+) {
+  let result = await promise;
+  if (result.status === "error") {
+    setMessage({ action, message: result.error });
+  }
+}
+
 let GithubLoader = () => (
   <Await promise={commands.getGithubToken()}>
     {token =>
@@ -343,6 +355,7 @@ let StageView: React.FC<{
   state: QuestState;
 }> = ({ index, stage, state }) => {
   let loader = useContext(Loader.context)!;
+  let setMessage = useContext(ErrorContext)!;
   return (
     <li>
       <div>
@@ -354,7 +367,13 @@ let StageView: React.FC<{
               <button
                 type="button"
                 onClick={() =>
-                  loader.loadAwait(commands.fileFeatureAndIssue(index))
+                  loader.loadAwait(
+                    tryAwait(
+                      commands.fileFeatureAndIssue(index),
+                      "Filing issue or feature PR",
+                      setMessage
+                    )
+                  )
                 }
               >
                 {stage.stage["no-starter"]
@@ -384,7 +403,13 @@ let StageView: React.FC<{
                   <button
                     type="button"
                     onClick={() =>
-                      loader.loadAwait(commands.fileSolution(index))
+                      loader.loadAwait(
+                        tryAwait(
+                          commands.fileSolution(index),
+                          "Filing solution PR",
+                          setMessage
+                        )
+                      )
                     }
                   >
                     File reference solution

diff --git a/rs/crates/repo-quest/src/github.rs b/rs/crates/repo-quest/src/github.rs
@@ -20,7 +20,7 @@ use regex::Regex;
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use specta::Type;
-use std::{env, fs, process::Command, sync::Arc, time::Duration};
+use std::{fs, process::Command, sync::Arc, time::Duration};
 use tokio::{time::timeout, try_join};
 use tracing::warn;