fix: reuse git action toast after feature-branch checkout

Julius Marminge committed 8 months ago

Commit 075df4e1 parent e4ab1091 file · +39 −22Browse files

Unified · Split

apps/web/src/components/GitActionsControl.tsx+39−22

   onConfirmed?: () => void;
 }
+type GitActionToastId = ReturnType<typeof toastManager.add>;
 function getMenuActionDisabledReason(
   item: GitActionMenuItem,
   gitStatus: GitStatusResult | null,
       skipDefaultBranchPrompt = false,
       statusOverride,
       isDefaultBranchOverride,
+      progressToastId,
     }: {
       action: GitStackedAction;
       commitMessage?: string;
       skipDefaultBranchPrompt?: boolean;
       statusOverride?: GitStatusResult | null;
       isDefaultBranchOverride?: boolean;
+      progressToastId?: GitActionToastId;
     }) => {
       const actionStatus = statusOverride ?? gitStatusForActions;
       const actionIsDefaultBranch = isDefaultBranchOverride ?? isDefaultBranch;
         forcePushOnly: forcePushOnlyProgress,
         ...(pushTarget ? { pushTarget } : {}),
       });
-      const progressToastId = toastManager.add({
+      const resolvedProgressToastId =
-        type: "loading",
+        progressToastId ??
-        title: progressStages[0] ?? "Running git action...",
+        toastManager.add({
-        timeout: 0,
+          type: "loading",
-        data: threadToastData,
+          title: progressStages[0] ?? "Running git action...",
-      });
+          timeout: 0,
+          data: threadToastData,
+        });
+      if (progressToastId) {
+        toastManager.update(progressToastId, {
+          type: "loading",
+          title: progressStages[0] ?? "Running git action...",
+          timeout: 0,
+          data: threadToastData,
+        });
+      }
       let stageIndex = 0;
       const stageInterval = setInterval(() => {
         stageIndex = Math.min(stageIndex + 1, progressStages.length - 1);
-        toastManager.update(progressToastId, {
+        toastManager.update(resolvedProgressToastId, {
           title: progressStages[stageIndex] ?? "Running git action...",
           type: "loading",
           timeout: 0,
           result.push.status === "pushed" &&
           !actionIsDefaultBranch;
         const closeResultToast = () => {
-          toastManager.close(progressToastId);
+          toastManager.close(resolvedProgressToastId);
         };
-        toastManager.update(progressToastId, {
+        toastManager.update(resolvedProgressToastId, {
           type: "success",
           title: resultToast.title,
           description: resultToast.description,
         });
       } catch (err) {
         stopProgressUpdates();
-        toastManager.update(progressToastId, {
+        toastManager.update(resolvedProgressToastId, {
           type: "error",
           title: "Action failed",
           description: err instanceof Error ? err.message : "An error occurred.",
       );
       const checkoutPromise = createBranchAndCheckoutMutation.mutateAsync(branchName);
-      toastManager.promise(checkoutPromise, {
+      const checkoutToastId = toastManager.add({
-        loading: { title: `Creating ${branchName}...`, data: threadToastData },
+        type: "loading",
-        success: () => ({
+        title: `Creating ${branchName}...`,
-          title: `Checked out ${branchName}`,
+        timeout: 0,
-          data: threadToastData,
+        data: threadToastData,
-        }),
-        error: (error) => ({
-          title: "Failed to checkout feature branch",
-          description: error instanceof Error ? error.message : "An error occurred.",
-          data: threadToastData,
-        }),
       });
       void checkoutPromise
             skipDefaultBranchPrompt: true,
             statusOverride,
             isDefaultBranchOverride: false,
+            progressToastId: checkoutToastId,
           });
         })
-        .catch(() => undefined);
+        .catch((error) => {
+          toastManager.update(checkoutToastId, {
+            type: "error",
+          title: "Failed to checkout feature branch",
+          description: error instanceof Error ? error.message : "An error occurred.",
+          data: threadToastData,
+          });
+        });
     },
     [
       branchList?.branches,