From 176301979a7b2f3672dd214d70a58d016e8ebaf7 Mon Sep 17 00:00:00 2001
From: Lorenzo Blasa <lblasa@meta.com>
Date: Fri, 28 Jul 2023 07:22:21 -0700
Subject: [PATCH] Open connectivity troubleshoot if unable to find device

Summary: If the notification is shown, allow engineers to switch to the connectivity troubleshooting view as it may highlight where the problem is.

Reviewed By: antonk52

Differential Revision: D47869154

fbshipit-source-id: f4154bb230d891dc4ac108b5acbe7e6541ffed1a
---
 .../src/dispatcher/flipperServer.tsx          | 30 +++++++++++++++++--
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx b/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
index 37bca37ea..08fccceef 100644
--- a/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
+++ b/desktop/flipper-ui-core/src/dispatcher/flipperServer.tsx
@@ -18,13 +18,17 @@ import {
   FlipperServerState,
 } from 'flipper-common';
 import Client from '../Client';
-import {notification} from 'antd';
+import {Button, notification} from 'antd';
 import {BaseDevice} from 'flipper-frontend-core';
 import {ClientDescription, timeout} from 'flipper-common';
 import {reportPlatformFailures} from 'flipper-common';
 import {sideEffect} from '../utils/sideEffect';
 import {waitFor} from '../utils/waitFor';
 import {NotificationBody} from '../ui/components/NotificationBody';
+import {Layout} from '../ui';
+import {setStaticView} from '../reducers/connections';
+import {ConnectivityHub} from '../chrome/ConnectivityHub';
+import {setTopLevelSelection} from '../reducers/application';
 
 export function connectFlipperServerToStore(
   server: FlipperServer,
@@ -307,10 +311,30 @@ export async function handleClientConnected(
           `[conn] Failed to find device '${query.device_id}' while connection app '${query.app}'`,
           e,
         );
+        const key = `device-find-failure-${query.device_id}`;
         notification.error({
-          key: `device-find-failure-${query.device_id}`,
+          key,
           message: 'Connection failed',
-          description: `Failed to find device '${query.device_id}' while trying to connect app '${query.app}'`,
+          description: (
+            <Layout.Bottom>
+              <p>
+                Failed to find device '{query.device_id}' while trying to
+                connect app '{query.app}'`
+              </p>
+              <div>
+                <Button
+                  type="primary"
+                  style={{float: 'right'}}
+                  onClick={() => {
+                    store.dispatch(setTopLevelSelection('connectivity'));
+                    store.dispatch(setStaticView(ConnectivityHub));
+                    notification.close(key);
+                  }}>
+                  Troubleshoot
+                </Button>
+              </div>
+            </Layout.Bottom>
+          ),
           duration: 0,
         });
       },