From b10a67d4432f699de0675635143eacd1dd26365e Mon Sep 17 00:00:00 2001
From: Pascal Hartig <realpassy@fb.com>
Date: Mon, 14 Oct 2019 10:07:06 -0700
Subject: [PATCH] Show potential errors alongside buttons

Summary:
Instead of replacing the buttons, this shows an error next to
them and gives the opportunity to retry.

Reviewed By: jknoxville

Differential Revision: D17907389

fbshipit-source-id: 15b27802671b39c53b32d01f1d2bcf8c67fd2647
---
 src/chrome/PluginInstaller.tsx | 56 ++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/src/chrome/PluginInstaller.tsx b/src/chrome/PluginInstaller.tsx
index 54ae3de32..e20bdf901 100644
--- a/src/chrome/PluginInstaller.tsx
+++ b/src/chrome/PluginInstaller.tsx
@@ -178,21 +178,23 @@ function InstallButton(props: {
   installed: boolean;
 }) {
   type InstallAction =
-    | {kind: 'Install'}
+    | {kind: 'Install'; error?: string}
     | {kind: 'Waiting'}
-    | {kind: 'Remove'}
-    | {kind: 'Error'; error: string};
+    | {kind: 'Remove'; error?: string};
 
-  const catchError = (fn: () => Promise<void>) => async () => {
+  const catchError = (
+    actionKind: 'Install' | 'Remove',
+    fn: () => Promise<void>,
+  ) => async () => {
     try {
       await fn();
     } catch (err) {
-      setAction({kind: 'Error', error: err.toString()});
+      setAction({kind: actionKind, error: err.toString()});
     }
   };
 
-  const onInstall = useCallback(
-    catchError(async () => {
+  const performInstall = useCallback(
+    catchError('Install', async () => {
       reportUsage(`${TAG}:install`, undefined, props.name);
       setAction({kind: 'Waiting'});
       await fs.ensureDir(PLUGIN_DIR);
@@ -227,8 +229,8 @@ function InstallButton(props: {
     [props.name, props.version],
   );
 
-  const onRemove = useCallback(
-    catchError(async () => {
+  const performRemove = useCallback(
+    catchError('Remove', async () => {
       reportUsage(`${TAG}:remove`, undefined, props.name);
       setAction({kind: 'Waiting'});
       await fs.remove(path.join(PLUGIN_DIR, props.name));
@@ -245,30 +247,38 @@ function InstallButton(props: {
   if (action.kind === 'Waiting') {
     return <Spinner size={16} />;
   }
-  if (action.kind === 'Error') {
-    const glyph = (
-      <AlignedGlyph color={colors.orange} size={16} name="caution-triangle" />
-    );
-    return (
-      <Tooltip
-        options={{position: 'toRight'}}
-        title={`Something went wrong: ${action.error}`}
-        children={glyph}
-      />
-    );
+  if ((action.kind === 'Install' || action.kind === 'Remove') && action.error) {
   }
-  return (
+  const button = (
     <TableButton
       compact
       type={action.kind === 'Install' ? 'primary' : undefined}
       onClick={
         action.kind === 'Install'
-          ? () => reportPlatformFailures(onInstall(), `${TAG}:install`)
-          : () => reportPlatformFailures(onRemove(), `${TAG}:remove`)
+          ? () => reportPlatformFailures(performInstall(), `${TAG}:install`)
+          : () => reportPlatformFailures(performRemove(), `${TAG}:remove`)
       }>
       {action.kind}
     </TableButton>
   );
+
+  if (action.error) {
+    const glyph = (
+      <AlignedGlyph color={colors.orange} size={16} name="caution-triangle" />
+    );
+    return (
+      <FlexRow>
+        <Tooltip
+          options={{position: 'toLeft'}}
+          title={`Something went wrong: ${action.error}`}
+          children={glyph}
+        />
+        {button}
+      </FlexRow>
+    );
+  } else {
+    return button;
+  }
 }
 
 function useNPMSearch(